diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 03:04:32 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 03:12:10 +0100 |
| commit | 08667c26780dcdf2ef9ce410b2c78931a1e94e83 (patch) | |
| tree | fe3224f5d4fcd36b3afc3d843e90d2d5aa62761a /tests/lena.pnm | |
| parent | e3b7f0e184a0f21ef7e5c78e180fef258f9c73aa (diff) | |
| parent | 0b0a7a751de02464a33717e70352f696372ba1c4 (diff) | |
| download | ffmpeg-08667c26780dcdf2ef9ce410b2c78931a1e94e83.tar.gz | |
Merge commit '0b0a7a751de02464a33717e70352f696372ba1c4'
* commit '0b0a7a751de02464a33717e70352f696372ba1c4':
mpegvideo: move encode-only parts of common_end() to encode_end()
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/lena.pnm')
0 files changed, 0 insertions, 0 deletions