diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-27 11:42:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-27 11:42:15 +0100 |
| commit | 12f203a0987935b79870a9502b7e148fa064897c (patch) | |
| tree | f75a50bee3da01c3104857891e97c03ac8e7145e /libavformat/4xm.c | |
| parent | ef8ab2f953079106bb4d72f9ce0af9c38f919130 (diff) | |
| parent | c24469e812501903a46a06eff9722a82e136e841 (diff) | |
| download | ffmpeg-12f203a0987935b79870a9502b7e148fa064897c.tar.gz | |
Merge commit 'c24469e812501903a46a06eff9722a82e136e841'
* commit 'c24469e812501903a46a06eff9722a82e136e841':
utils: add workaround for AVHWAccel in ff_get_buffer compat code
configure: Remove a stray msmpeg4v1 encoder declaration
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/4xm.c')
0 files changed, 0 insertions, 0 deletions