diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-17 23:51:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-18 00:38:07 +0200 |
| commit | cdc166acd80bf7de7338ac95b3f283dd531a9a06 (patch) | |
| tree | d818820e0e2fb920e510ac6a92ff4f46a248468e /libavcodec/huffyuvenc.c | |
| parent | a8d01a73789260533778371e38e733d047316d83 (diff) | |
| parent | 32d05934abc7427bb90380a4c1ab20a15fd7d821 (diff) | |
| download | ffmpeg-cdc166acd80bf7de7338ac95b3f283dd531a9a06.tar.gz | |
Merge commit '32d05934abc7427bb90380a4c1ab20a15fd7d821'
* commit '32d05934abc7427bb90380a4c1ab20a15fd7d821':
mp3dec: decode more data from Info header
Conflicts:
libavformat/mp3dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/huffyuvenc.c')
0 files changed, 0 insertions, 0 deletions