diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-27 14:56:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-27 15:02:12 +0100 |
| commit | 9e893473297ed5c60d40a19eb17a85dca2e63ab3 (patch) | |
| tree | d5b576132ba517872c2bad8e8423a96e3d0bef3b /libavcodec/mpeg4video.c | |
| parent | 6f764d291121f4980b292cdaa537aa8fb10cb93b (diff) | |
| parent | 60d4c6ff76467d4d8f55c1cc61ab6c618e8ea2f3 (diff) | |
| download | ffmpeg-9e893473297ed5c60d40a19eb17a85dca2e63ab3.tar.gz | |
Merge commit '60d4c6ff76467d4d8f55c1cc61ab6c618e8ea2f3'
* commit '60d4c6ff76467d4d8f55c1cc61ab6c618e8ea2f3':
h264: restore a block mistakenly removed in e10fd08a
See: 0ecb3075c1c243cfb656d1cbe0b19cdb91bde659
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg4video.c')
0 files changed, 0 insertions, 0 deletions