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-16 09:19:11 +02:00
2013-05-16 09:56:43 +02:00
2013-05-14 12:42:04 +03:00
2013-05-14 12:42:05 +03:00
2013-05-14 12:42:03 +03:00
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-16 09:56:43 +02:00
2013-05-16 00:23:30 +02:00
2013-05-14 22:51:12 +02:00
2013-05-14 22:51:12 +02:00
2013-05-15 07:46:51 +02:00
2013-05-13 14:39:32 +02:00
2013-05-10 16:53:50 -03:00
2013-05-16 09:56:43 +02:00
2013-05-16 09:56:43 +02:00
2013-05-15 12:15:21 +02:00
2013-05-16 09:56:43 +02:00
2013-05-16 09:56:43 +02:00
2013-05-11 21:23:46 +02:00
2013-05-11 20:17:45 +02:00
2013-05-15 07:46:51 +02:00
2013-05-15 07:46:51 +02:00
2013-05-16 09:56:43 +02:00
2013-05-16 09:56:43 +02:00
2013-05-16 09:56:43 +02:00
2013-05-15 11:23:14 +02:00
2013-05-10 23:26:32 +02:00
2013-05-16 09:56:43 +02:00
2013-05-16 09:56:43 +02:00
2013-05-15 10:39:00 +02:00
2013-05-16 09:46:19 +02:00
2013-05-16 09:46:19 +02:00
2013-05-16 09:46:19 +02:00
2013-05-16 09:46:19 +02:00
2013-05-16 09:46:19 +02:00
2013-05-13 18:52:00 +02:00
2013-05-14 22:44:08 +02:00
2013-05-10 16:53:50 -03:00
2013-05-16 09:56:43 +02:00
2013-05-16 09:56:43 +02:00
2013-05-16 09:56:43 +02:00
2013-05-16 09:56:43 +02:00
2013-05-16 09:56:43 +02:00
2013-05-16 09:56:43 +02:00
2013-05-15 20:09:20 +02:00
2013-05-16 09:56:43 +02:00
2013-05-16 09:56:43 +02:00
2013-05-15 11:10:09 +02:00
2013-05-11 20:17:45 +02:00
2013-05-15 11:10:09 +02:00
2013-05-16 09:56:43 +02:00
2013-05-16 09:56:43 +02:00
2013-05-15 07:46:51 +02:00
2013-05-16 09:56:43 +02:00
2013-05-15 11:23:14 +02:00
2013-05-16 09:11:04 +02:00
2013-05-15 12:13:53 +03:00
2013-05-15 20:09:20 +02:00
2013-05-10 16:53:50 -03:00
2013-05-13 14:27:35 +02:00
2013-05-15 11:10:09 +02:00