1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
FFmpeg/libavfilter/x86
Michael Niedermayer d1dad7c824 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  mpc8: return more meaningful error codes.
  mpc: return more meaningful error codes.
  wv,mpc8: don't return apetag data in packets.
  rtmp: do not warn about receiving metadata packets
  x86: h264dsp: Adjust YASM #ifdefs
  x86: yadif: Mark mmxext optimizations as such
  h264: convert loop filter strength dsp function to yasm.
  Improve descriptiveness of a number of codec and container long names

Conflicts:
	libavcodec/flvdec.c
	libavcodec/libopenjpegdec.c
	libavformat/apetag.c
	libavformat/mp3dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-31 22:41:00 +02:00
..
gradfun.c Merge remote-tracking branch 'qatar/master' 2012-07-23 21:25:09 +02:00
Makefile Add gradfun filter, ported from MPlayer. 2010-12-12 17:59:10 +00:00
yadif_template.c Merge remote-tracking branch 'qatar/master' 2012-07-02 21:19:41 +02:00
yadif.c Merge remote-tracking branch 'qatar/master' 2012-07-31 22:41:00 +02:00