Michael Niedermayer fa14685a57 Merge commit '7b9cb7b365' ... * commit '7b9cb7b365': avprobe: Export coded_{width,height} in -show_streams Conflicts: avprobe.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2015-03-08 23:58:18 +01:00
..
acodec	tests/fate: Add S302M test	2015-03-02 11:09:08 +01:00
fate	Merge commit '7b9cb7b365'	2015-03-08 23:58:18 +01:00
lavf	avformat/mxfenc: adjust product name when opatom muxer is used	2015-03-03 12:13:21 +01:00
lavf-fate	Merge commit 'ef363ebd59'	2014-10-24 15:30:12 +02:00
seek	test/fate: added mxf_opatom regression tests	2015-02-10 11:28:53 +01:00
vsynth	avformat/movenc: Move avid DNxHD padding to the correct spot	2015-02-20 12:17:14 +01:00
vsynth1
vsynth_lena	tests: Rename vsynth2 to vsynth_lena	2014-12-02 03:02:30 +01:00