Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Aug 2011 21:32:51 +0000 (23:32 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Aug 2011 21:32:51 +0000 (23:32 +0200)
commit60b54e4b9fac8519bb68501b73ac0efbcce5cff0
treea9d2f4a934bd7c9c53fd6c277bca006adc28d1d5
parentada49f936eaafe12365c7b962355d6dcfbfc4029
parente6d2b73784e5488d95c1ab76287f2eba9ca94d7d
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avconv: Set error code before before jumping to fail.
  h264: fix PCM intra-coded blocks in monochrome case

Conflicts:
libavcodec/h264.c

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