diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 14:55:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 14:55:48 +0100 |
| commit | acc0c0190bd6144d921397d53e928532a8d86de0 (patch) | |
| tree | f7296da32f37597be3fd11bd4ac9fddf6037743a /libavcodec/aacpsdata.c | |
| parent | fbdb0313f53f84f5a8a5a23ad1880bf7ef4dcc5f (diff) | |
| parent | f53490cc0c809975f8238d5a9edbd26f83bd2f84 (diff) | |
| download | ffmpeg-acc0c0190bd6144d921397d53e928532a8d86de0.tar.gz | |
Merge commit 'f53490cc0c809975f8238d5a9edbd26f83bd2f84'
* commit 'f53490cc0c809975f8238d5a9edbd26f83bd2f84':
rtpdec/srtp: Handle CSRC fields being present
rtpdec: Check the return value from av_new_packet
ac3dec: fix non-optimal dithering of zero bit mantissas
Conflicts:
libavcodec/ac3dec.c
libavformat/rtpdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aacpsdata.c')
0 files changed, 0 insertions, 0 deletions