Merge commit '02b7c630875c0bc63cee5ec597aa33baf9bf4e20'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 8 Jul 2015 22:49:20 +0000 (00:49 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 8 Jul 2015 22:49:20 +0000 (00:49 +0200)
commitedfcbf7c83cb7828c0531e788ba8c5c47b07fc5f
treeec173fd62aa7a5e0cbdc6e729169209cbe5ec58b
parenta137e50ee54cd902c436d15463c6e621623cc9ad
parent02b7c630875c0bc63cee5ec597aa33baf9bf4e20
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>
libavcodec/h261enc.c
tests/ref/vsynth/vsynth1-h261
tests/ref/vsynth/vsynth1-h261-trellis
tests/ref/vsynth/vsynth2-h261
tests/ref/vsynth/vsynth2-h261-trellis
tests/ref/vsynth/vsynth_lena-h261
tests/ref/vsynth/vsynth_lena-h261-trellis