diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-07 23:16:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-07 23:16:59 +0200 |
| commit | 242b3c292a49cc620fae6554ab74e748392d9197 (patch) | |
| tree | b946515645d5a175fca30ace4208bfafa36c0aa7 /libavcodec/rtjpeg.h | |
| parent | 75be508f7c6ed946170eab3323f6749f84dbb8b8 (diff) | |
| parent | 1e9a93bfca2c2f43a07e01f2ef9fd5cbafe6c22d (diff) | |
| download | ffmpeg-242b3c292a49cc620fae6554ab74e748392d9197.tar.gz | |
Merge commit '1e9a93bfca2c2f43a07e01f2ef9fd5cbafe6c22d'
* commit '1e9a93bfca2c2f43a07e01f2ef9fd5cbafe6c22d':
libfdk-aacdec: Decode the first AAC frame to reliably identify the bitstream
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/rtjpeg.h')
0 files changed, 0 insertions, 0 deletions