Merge remote-tracking branch 'qatar/master'
* qatar/master:
asfdec: read attached pictures.
apetag: reindent
apetag: export attached covers as video streams.
apetag: fix the amount of data read from binary tags.
apetag: make sure avio_get_str() doesn't read more than it should.
mov: read itunes cover art.
snow: remove VLA in mc_block()
intfloat: Don't use designated initializers in the public headers
snow: remove a VLA.
doc: Remind devs to check return values, especially for malloc() et al
MS ATC Screen (aka MSS3) decoder
vf_yadif: move x86 init code to x86/yadif.c
vf_gradfun: move x86 init code to x86/gradfun.c
roqvideo: Remove a totally unused dspcontext
smacker: remove some unused code
dsicin: remove dead assignment
aacdec: remove dead assignment
rl2: remove dead assignment
proresenc: make a variable local to the loop where it is used
alsdec: remove dead assignments
Conflicts:
Changelog
doc/developer.texi
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/version.h
libavfilter/gradfun.h
libavfilter/x86/gradfun.c
Merged-by:
Michael Niedermayer <michaelni@gmx.at>
No related branches found
No related tags found
Showing
- Changelog 1 addition, 0 deletionsChangelog
- doc/developer.texi 4 additions, 0 deletionsdoc/developer.texi
- doc/general.texi 2 additions, 0 deletionsdoc/general.texi
- libavcodec/Makefile 1 addition, 0 deletionslibavcodec/Makefile
- libavcodec/aacdec.c 1 addition, 1 deletionlibavcodec/aacdec.c
- libavcodec/allcodecs.c 1 addition, 0 deletionslibavcodec/allcodecs.c
- libavcodec/alsdec.c 2 additions, 2 deletionslibavcodec/alsdec.c
- libavcodec/avcodec.h 1 addition, 0 deletionslibavcodec/avcodec.h
- libavcodec/dsicinav.c 1 addition, 1 deletionlibavcodec/dsicinav.c
- libavcodec/mss3.c 967 additions, 0 deletionslibavcodec/mss3.c
- libavcodec/proresenc_kostya.c 1 addition, 2 deletionslibavcodec/proresenc_kostya.c
- libavcodec/rl2.c 1 addition, 1 deletionlibavcodec/rl2.c
- libavcodec/roqvideo.h 0 additions, 1 deletionlibavcodec/roqvideo.h
- libavcodec/smacker.c 1 addition, 5 deletionslibavcodec/smacker.c
- libavcodec/snow.c 25 additions, 16 deletionslibavcodec/snow.c
- libavcodec/snowenc.c 21 additions, 20 deletionslibavcodec/snowenc.c
- libavcodec/version.h 1 addition, 1 deletionlibavcodec/version.h
- libavfilter/gradfun.h 2 additions, 5 deletionslibavfilter/gradfun.h
- libavfilter/vf_gradfun.c 2 additions, 7 deletionslibavfilter/vf_gradfun.c
- libavfilter/vf_yadif.c 3 additions, 43 deletionslibavfilter/vf_yadif.c
Loading
Please register or sign in to comment