Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Mar 2013 11:41:34 +0000 (12:41 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Mar 2013 11:41:34 +0000 (12:41 +0100)
commita9ddb624890dd8c334617239793e63d93fbd52ee
treed1b6919c46a238f1a9c926106cddb0d283badd60
parentfa92ee821bba1d3c2a497ed22e41927b552856f8
parent1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e
Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e'

* commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e':
  avformat: av_log_ask_for_sample() ---> avpriv_request_sample()

Conflicts:
libavformat/mxfdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
18 files changed:
libavformat/anm.c
libavformat/au.c
libavformat/bethsoftvid.c
libavformat/filmstripdec.c
libavformat/mov.c
libavformat/mpegts.c
libavformat/mtv.c
libavformat/mxfdec.c
libavformat/omadec.c
libavformat/rsodec.c
libavformat/rtpdec_latm.c
libavformat/rtpdec_qt.c
libavformat/smjpegdec.c
libavformat/spdifdec.c
libavformat/spdifenc.c
libavformat/westwood_aud.c
libavformat/xmv.c
libavformat/xwma.c