Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Oct 2013 13:30:31 +0000 (14:30 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Oct 2013 13:37:53 +0000 (14:37 +0100)
commit269b3c8799f446a512d8a084da5c00a3e8a3a87b
tree76487e09972cc3e450aebfcaa6259262e88e3e45
parent17e47ec8be200d54aa7ef31994e1ba5ea5f32622
parent6c82c87dbbc0582658968eae46cfebeea90a9c5e
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ac3dec: fix outptr increment.

Conflicts:
libavcodec/ac3dec.c

No change as this has been fixed in ffmpeg head already

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