diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-22 01:08:03 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-22 01:08:28 +0100 |
| commit | dedbefee60430e04551977553838e89dad4ff932 (patch) | |
| tree | b3e8f39ade076809a59ef7568a375731045ba4f3 /libavdevice/v4l2-common.c | |
| parent | fee2cc39becb1930461dff267389717337804a4a (diff) | |
| parent | 5cbae5651d7c1ce9b0691dfbf2d474cb2b0ebb9a (diff) | |
| download | ffmpeg-dedbefee60430e04551977553838e89dad4ff932.tar.gz | |
Merge commit '5cbae5651d7c1ce9b0691dfbf2d474cb2b0ebb9a'
* commit '5cbae5651d7c1ce9b0691dfbf2d474cb2b0ebb9a':
mpegaudio_parser: add MP3 ADU headers parser
Conflicts:
libavcodec/mpegaudio_parser.c
libavcodec/mpegaudiodecheader.c
libavcodec/version.h
See: 8ca098f4445cd12d39b2c55b0dfb8c988b7b28ce
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/v4l2-common.c')
0 files changed, 0 insertions, 0 deletions