Merge commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Dec 2012 11:06:15 +0000 (12:06 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Dec 2012 11:06:15 +0000 (12:06 +0100)
commit40ea3438661e6cc30b60bc019ae01fb073eabb35
tree618cba03caedda423e3c34f9bd463afcd94f0800
parent174c483e2e751c71ca9ae4e9ca33082bbb1eea56
parentc661cb6672af5ebcb900ec8766b24761bd2ab011
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>
cmdutils.c
cmdutils.h
ffmpeg_opt.c
libavcodec/h264_ps.c
libavformat/isom.c
libavformat/mov.c