Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 23 Jan 2014 19:15:17 +0000 (20:15 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 23 Jan 2014 19:15:21 +0000 (20:15 +0100)
* qatar/master:
  rtpdec_asf: Copy the need_parsing field from the chained demuxer

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/rtpdec_asf.c

Simple merge