[FFmpeg-cvslog] Merge commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Dec 20 12:06:15 2012 +0100| [40ea3438661e6cc30b60bc019ae01fb073eabb35] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=40ea3438661e6cc30b60bc019ae01fb073eabb35
---