Merge commit 'd9ebb00dcbaac3812b8b1fbc3d6e027506c11cbc'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 16 Feb 2013 13:30:21 +0000 (14:30 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 16 Feb 2013 13:30:21 +0000 (14:30 +0100)
commit8b7568cc3482e9ee066855c91ca8445dde710cd3
treef7014eec6b8394937a53dd35d218692bac06d6e2
parent131b9c924d6df2b52ca5821a13ddf6fdb49fe76c
parentd9ebb00dcbaac3812b8b1fbc3d6e027506c11cbc
Merge commit 'd9ebb00dcbaac3812b8b1fbc3d6e027506c11cbc'

* commit 'd9ebb00dcbaac3812b8b1fbc3d6e027506c11cbc':
  svq3: remove a pointless if()
  h264: remove a pointless if()

Conflicts:
libavcodec/h264.c
libavcodec/svq3.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264.c
libavcodec/svq3.c