aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/rm.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-04-04 02:15:12 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-04-04 02:15:12 +0200
commit2cae9809e2d59c7336fc2cccb97b82c7f764868a (patch)
tree823d962b7237e515e14e2679084e5981d5b808a5 /libavformat/rm.h
parent3c9bfb336867ccd32a6e8490930961bcc14b3fdc (diff)
parent906fd03070c7dc39b4c937befa2c3559bccf7ba7 (diff)
downloadffmpeg-2cae9809e2d59c7336fc2cccb97b82c7f764868a.tar.gz
Merge remote branch 'qatar/master'
* qatar/master: fate: fix partial run when no samples path is specified ARM: NEON fixed-point forward MDCT ARM: NEON fixed-point FFT lavf: bump minor version and add an APIChanges entry for avio changes avio: simplify url_open_dyn_buf_internal by using avio_alloc_context() avio: make url_fdopen internal. avio: make url_open_dyn_packet_buf internal. avio: avio_ prefix for url_close_dyn_buf avio: avio_ prefix for url_open_dyn_buf avio: introduce an AVIOContext.seekable field ac3enc: use generic fixed-point mdct lavfi: add fade filter Change yadif to not use out of picture lines. lavc: deprecate AVCodecContext.antialias_algo lavc: mark mb_qmin/mb_qmax for removal on next major bump. Conflicts: doc/filters.texi libavcodec/ac3enc_fixed.h libavcodec/ac3enc_float.h libavfilter/Makefile libavfilter/allfilters.c libavfilter/vf_fade.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rm.h')
0 files changed, 0 insertions, 0 deletions