diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-07-09 00:49:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-07-09 00:49:20 +0200 |
| commit | edfcbf7c83cb7828c0531e788ba8c5c47b07fc5f (patch) | |
| tree | ec173fd62aa7a5e0cbdc6e729169209cbe5ec58b /tests/ref/acodec/adpcm-ms-trellis | |
| parent | a137e50ee54cd902c436d15463c6e621623cc9ad (diff) | |
| parent | 02b7c630875c0bc63cee5ec597aa33baf9bf4e20 (diff) | |
| download | ffmpeg-edfcbf7c83cb7828c0531e788ba8c5c47b07fc5f.tar.gz | |
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>
Diffstat (limited to 'tests/ref/acodec/adpcm-ms-trellis')
0 files changed, 0 insertions, 0 deletions