diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 01:38:55 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 01:38:55 +0100 |
| commit | 36e2ec40688d0c3c350d31fae00a54f6a23b7647 (patch) | |
| tree | 80cf0550bc36f8b772d1cfbc83b1ea48e988ac45 /libpostproc/Makefile | |
| parent | db7580b4f6b2217917aa6f372e3a18dfca43624a (diff) | |
| parent | f7d228676cb7669059889c4225c8a8dc56708c24 (diff) | |
| download | ffmpeg-36e2ec40688d0c3c350d31fae00a54f6a23b7647.tar.gz | |
Merge commit 'f7d228676cb7669059889c4225c8a8dc56708c24'
* commit 'f7d228676cb7669059889c4225c8a8dc56708c24':
mpeg4videodec: move intra_dc_threshold from MpegEncContext to Mpeg4DecContext
Conflicts:
libavcodec/mpeg4videodec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libpostproc/Makefile')
0 files changed, 0 insertions, 0 deletions