aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/rsodec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-03-14 12:30:19 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-03-14 12:30:19 +0100
commitfa92ee821bba1d3c2a497ed22e41927b552856f8 (patch)
tree26bb0752049f1abb82e03e127f175ff2c0b78387 /libavformat/rsodec.c
parent905e7eb41389e4394e9c6e459b7d1a99dc30b075 (diff)
parent63d744e2be39466e3a734c2987cd713e0bac101e (diff)
downloadffmpeg-fa92ee821bba1d3c2a497ed22e41927b552856f8.tar.gz
Merge commit '63d744e2be39466e3a734c2987cd713e0bac101e'
* commit '63d744e2be39466e3a734c2987cd713e0bac101e': av_log_missing_feature() ---> avpriv_report_missing_feature() Conflicts: libavcodec/aacdec.c libavcodec/tta.c libavformat/mpegts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rsodec.c')
0 files changed, 0 insertions, 0 deletions