Michael Niedermayer
edfcbf7c83
Merge commit '02b7c630875c0bc63cee5ec597aa33baf9bf4e20'
...
* commit '02b7c630875c0bc63cee5ec597aa33baf9bf4e20':
h261: Signal freeze picture release for intra frames
Conflicts:
tests/ref/vsynth/vsynth1-h261
tests/ref/vsynth/vsynth2-h261
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-09 00:49:20 +02:00
Michael Niedermayer
a137e50ee5
Merge commit 'dc1de0b958836545339611e9c050a1d4fdded263'
...
* commit 'dc1de0b958836545339611e9c050a1d4fdded263':
h261: Set 'still image mode off' in picture header
Conflicts:
tests/ref/vsynth/vsynth1-h261
tests/ref/vsynth/vsynth2-h261
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-09 00:33:52 +02:00
Michael Niedermayer
adfde9a646
avformat/avienc: Fix wrongly placed comment
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-19 17:30:28 +01:00
Michael Niedermayer
ed49b142bb
tests: Rename vsynth2 to vsynth_lena
...
This avoids confusion with a growing number of vsynth tests
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-02 03:02:30 +01:00
