diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-07 00:38:50 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-07 00:39:44 +0100 |
commit | 0d0a905152f6792901551bf3be39a38b38a36656 (patch) | |
tree | a4bb3d18da665b468cd07e882c6e530c0abae6a8 /libavcodec/hnm4video.c | |
parent | 4009ee3eccac686ee2f01837cc8877012c47314c (diff) | |
parent | e581e88cbdb3323ca0026a54b39a9716a3686e9f (diff) | |
download | ffmpeg-0d0a905152f6792901551bf3be39a38b38a36656.tar.gz |
Merge commit 'e581e88cbdb3323ca0026a54b39a9716a3686e9f'
* commit 'e581e88cbdb3323ca0026a54b39a9716a3686e9f':
movenc: Readd an accidentally removed condition
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hnm4video.c')
0 files changed, 0 insertions, 0 deletions