diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 02:25:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 02:27:41 +0100 |
| commit | 2b1922d9641012a01eee144a4410f5e94ccfbec7 (patch) | |
| tree | 63f63d8d4383a2a661bd6da140f7275d6b719a29 /doc/Doxyfile | |
| parent | 6c9b82b6a0d5cbdf90dcbf9f4e1c77ae82c5698f (diff) | |
| parent | b452d5ae866942cec00aa1432fe29498b38b49fc (diff) | |
| download | ffmpeg-2b1922d9641012a01eee144a4410f5e94ccfbec7.tar.gz | |
Merge commit 'b452d5ae866942cec00aa1432fe29498b38b49fc'
* commit 'b452d5ae866942cec00aa1432fe29498b38b49fc':
mpeg4videodec: move mpeg4-specific bug detection from h263 generic code to mpeg4
Conflicts:
libavcodec/h263dec.c
not merged, the header decode function is not the right place
See: 6c9b82b6a0d5cbdf90dcbf9f4e1c77ae82c5698f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/Doxyfile')
0 files changed, 0 insertions, 0 deletions