[FFmpeg-cvslog] Merge commit '1f0c6075604c271d5627480f1243d22795f9a315'

Michael Niedermayer git at videolan.org
Thu Jun 13 13:07:03 CEST 2013

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jun 13 12:57:34 2013 +0200| [18cb3d355f13df255f0d438c06607b637842e8b5] | committer: Michael Niedermayer

Merge commit '1f0c6075604c271d5627480f1243d22795f9a315'

* commit '1f0c6075604c271d5627480f1243d22795f9a315':
  4xm: drop pointless assert


The added condition is impossible to occur and thus is added to the assert.
The assert is not removed from the default case, as the default case cannot
occur. Thus either it should stay as is or the case as a whole be removed.
For extra safety, to ensure this doesnt change the assert is changed to

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=18cb3d355f13df255f0d438c06607b637842e8b5

More information about the ffmpeg-cvslog mailing list