diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-05 09:52:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-05 09:52:06 +0200 |
| commit | d6c36fba0be8aaa7ba3f15f8a2a7b872817200f3 (patch) | |
| tree | ba6a2fdde37de88532c6174091d2a53fbc96aecd /libavformat/mxfenc.c | |
| parent | 48af87819a035816f2fd0270d4ac3e54143a86a2 (diff) | |
| parent | a10c4ce24bd4a0dd557d5849aa53a0cc74677808 (diff) | |
| download | ffmpeg-d6c36fba0be8aaa7ba3f15f8a2a7b872817200f3.tar.gz | |
Merge commit 'a10c4ce24bd4a0dd557d5849aa53a0cc74677808'
* commit 'a10c4ce24bd4a0dd557d5849aa53a0cc74677808':
aac: Forward errors properly in aac_decode_frame_int
Conflicts:
libavcodec/aacdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mxfenc.c')
0 files changed, 0 insertions, 0 deletions