diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-26 12:44:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-26 12:44:29 +0200 |
| commit | f5a0c205d91d049a663f704dda606a5562055efb (patch) | |
| tree | 307a3a4a025dee98bd9fd7578cf48f01660c331e /libavcodec/h264pred.h | |
| parent | 8d679bc7e665d23ffabee93554ee90212b7a7c20 (diff) | |
| parent | bf9856250584228678963ce8f11c54f85005d783 (diff) | |
| download | ffmpeg-f5a0c205d91d049a663f704dda606a5562055efb.tar.gz | |
Merge commit 'bf9856250584228678963ce8f11c54f85005d783'
* commit 'bf9856250584228678963ce8f11c54f85005d783':
mov: Refactor codec id selection in mov_codec_id
Conflicts:
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264pred.h')
0 files changed, 0 insertions, 0 deletions