diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-24 10:15:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-24 10:15:50 +0200 |
| commit | 865f34823c57fcb1a42a744cc9f38959ec5b427b (patch) | |
| tree | 3b8f1701a13b7b87a38052c833aa2668aa4d1804 /ffserver.c | |
| parent | 6bab3430a775183f2f9acbd91d1376c71e87c026 (diff) | |
| parent | 70ecc175c7b513a153ac87d1c5d219556ca55070 (diff) | |
| download | ffmpeg-streaming-865f34823c57fcb1a42a744cc9f38959ec5b427b.zip ffmpeg-streaming-865f34823c57fcb1a42a744cc9f38959ec5b427b.tar.gz | |
Merge commit '70ecc175c7b513a153ac87d1c5d219556ca55070'
* commit '70ecc175c7b513a153ac87d1c5d219556ca55070':
alsdec: Fix the clipping range
Conflicts:
libavcodec/alsdec.c
See: feaff427c0df015146f660199453bd8c0314e677
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffserver.c')
0 files changed, 0 insertions, 0 deletions
