diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-21 21:56:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-21 21:56:33 +0200 |
| commit | fca76dc61ed650477c6e537b9db7c4ae2767197b (patch) | |
| tree | c01c02fc8e7e628da3eb9662a3a57e1ed84d6e59 /libavformat/swfenc.c | |
| parent | 2bfd4ff16dddc46d30b9e3510cb31e3b1b1b90fe (diff) | |
| parent | 13c90bc9a359e969cc2b7f7e8199b02a0e4c6ec9 (diff) | |
| download | ffmpeg-fca76dc61ed650477c6e537b9db7c4ae2767197b.tar.gz | |
Merge commit '13c90bc9a359e969cc2b7f7e8199b02a0e4c6ec9'
* commit '13c90bc9a359e969cc2b7f7e8199b02a0e4c6ec9':
adts: Return more meaningful error codes
Conflicts:
libavformat/adtsenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/swfenc.c')
0 files changed, 0 insertions, 0 deletions