Michael Niedermayer 40ea343866 Merge commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011' ...

* commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011':
  cmdutils: pass number of groups to split_commandline().
  mov: handle h263 and flv1 for codec_tag 'H','2','6','3'
  h264: fix sps parsing for SVC and CAVLC 4:4:4 Intra profiles

Conflicts:
	libavcodec/h264_ps.c
	libavformat/isom.c
	libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2012-12-20 12:06:15 +01:00

18 KiB

Raw Blame History

View Raw