aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/asf.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-11-14 11:22:40 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-11-14 11:59:20 +0100
commite13d5e9a4b5b4de065b00b1caea850cd47fd4b18 (patch)
tree13bf2f01763823c4e4da6374acadc95b3f8bc121 /libavformat/asf.h
parent26afdbcfc0ecd646c6d829b781e0a53d6b289186 (diff)
parent5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2 (diff)
downloadffmpeg-e13d5e9a4b5b4de065b00b1caea850cd47fd4b18.tar.gz
Merge commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2'
* commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2': x86: h264_weight_10bit: port to cpuflags libtheoraenc: add missing pixdesc.h header avcodec: remove ff_is_hwaccel_pix_fmt pixdesc: add av_pix_fmt_get_chroma_sub_sample hlsenc: stand alone hls segmenter Conflicts: doc/muxers.texi libavcodec/ffv1enc.c libavcodec/imgconvert.c libavcodec/mpegvideo_enc.c libavcodec/tiffenc.c libavformat/Makefile libavformat/allformats.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/asf.h')
0 files changed, 0 insertions, 0 deletions