FFmpeg/libavformat
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-03-17 04:38:28 +01:00
2013-05-10 16:10:52 -03:00
2013-01-22 20:27:05 +01:00
2013-05-10 16:53:02 -03:00
2013-04-07 03:59:44 +02:00
2013-04-08 14:15:10 +02:00
2013-02-22 13:52:43 +00:00
2013-05-15 16:53:35 +02:00
2013-04-15 12:13:41 +02:00
2013-01-24 15:02:44 +00:00
2013-04-17 00:37:05 +02:00
2013-04-20 00:11:04 +02:00
2013-04-20 00:05:35 +02:00
2013-04-19 14:44:58 +02:00
2013-04-18 00:24:25 +02:00
2013-01-17 04:55:14 +01:00
2013-05-10 16:53:02 -03:00
2013-04-04 04:04:24 +02:00
2013-01-15 20:19:28 +01:00
2013-03-31 16:10:52 +02:00
2013-05-01 11:56:34 +02:00
2013-05-01 11:56:34 +02:00
2013-04-17 02:16:58 +02:00
2013-05-10 16:53:50 -03:00
2013-04-03 13:01:38 +00:00
2013-04-05 14:30:56 +00:00
2013-05-10 16:53:02 -03:00
2013-05-06 10:58:31 +02:00
2013-02-13 17:36:55 +00:00
2013-01-20 20:59:30 +01:00
2013-05-15 10:51:30 +00:00