aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/rtpdec_asf.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-01-09 12:30:14 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-01-09 12:30:14 +0100
commit4765f635387cef3efb01e52e59d4f3add126a0e2 (patch)
treea41b58a7f4262729b93f5e7a7538fc41770b9f93 /libavformat/rtpdec_asf.c
parent75afbe2ab4a14cdfdc4001869ae67ded99cf5ce7 (diff)
parentd744801f1a7c65200a6ed207bb0dea197432288e (diff)
downloadffmpeg-4765f635387cef3efb01e52e59d4f3add126a0e2.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: xan: Convert to bytestream2 oggenc: add a page_duration option and deprecate the pagesize option x86: lavr: add SSE2/AVX dither_int_to_float() Conflicts: libavcodec/xan.c libavformat/oggenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpdec_asf.c')
0 files changed, 0 insertions, 0 deletions