ffmpeg/libavcodec
Michael Niedermayer efc08e00cc Merge commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110'
* commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110':
  vf_aspect: use the name 's' for the pointer to the private context
  Remove commented-out debug #define cruft

Conflicts:
	libavcodec/4xm.c
	libavcodec/dvdsubdec.c
	libavcodec/ituh263dec.c
	libavcodec/mpeg12.c
	libavfilter/avfilter.c
	libavfilter/vf_aspect.c
	libavfilter/vf_fieldorder.c
	libavformat/rtmpproto.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-16 09:56:43 +02:00
..
2013-05-10 16:53:50 -03:00
2013-05-10 16:10:51 -03:00
2013-05-10 16:53:50 -03:00
2013-05-13 14:39:32 +02:00
2013-05-10 16:53:50 -03:00
2013-05-15 12:15:21 +02:00
2013-05-11 21:23:46 +02:00
2013-05-10 16:53:50 -03:00
2013-05-10 16:53:50 -03:00