Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Dec 2012 11:18:28 +0000 (12:18 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Dec 2012 11:18:28 +0000 (12:18 +0100)
commit41135b7f64e699a71250b0c2082ba53b0338069a
tree722cfb318703cc777579faa3d1996f8c340d35cf
parent40ea3438661e6cc30b60bc019ae01fb073eabb35
parentb2fe6756e34d1316d0fa799e8a5ace993059c407
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavr: add option for dithering during sample format conversion to s16
  mpeg12: do not decode extradata more than once.

Conflicts:
libavcodec/mpeg12.c
libavcodec/mpeg12.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpeg12.c
libavcodec/mpeg12.h
libavresample/utils.c