diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-27 01:31:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-27 02:05:22 +0200 |
| commit | 357168bcf63429e9472fb9fff1e1301f9514dca6 (patch) | |
| tree | 04b94fe1d99e435cbe63d1b2ef06a728121f21e5 /libavformat/a64.c | |
| parent | 826726b83fab660e45166bca476c4e91713c62aa (diff) | |
| parent | 5ec6d152e26c570c0a16ec72c1f354db95708179 (diff) | |
| download | ffmpeg-357168bcf63429e9472fb9fff1e1301f9514dca6.tar.gz | |
Merge commit '5ec6d152e26c570c0a16ec72c1f354db95708179'
* commit '5ec6d152e26c570c0a16ec72c1f354db95708179':
indeo4: B-frames decoding
Conflicts:
libavcodec/ivi_common.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/a64.c')
0 files changed, 0 insertions, 0 deletions