git.ffmpeg.org Git - ffmpeg.git/commit

author	Michael Niedermayer <michaelni@gmx.at>
	Thu, 6 Nov 2014 12:10:01 +0000 (13:10 +0100)
committer	Michael Niedermayer <michaelni@gmx.at>
	Thu, 6 Nov 2014 12:10:01 +0000 (13:10 +0100)
commit	042eba52a5ff4939b8c548a9fb5e209790c17b37
tree	418842b474845621da39f48de2ceaaee3874aba8	tree \| snapshot
parent	c04c43b3e423d0426162828e7b180e4d0014a3f7	commit \| diff
parent	91e8d2eb1f7bf3af949008b106ec1ca037b88b0e	commit \| diff

Merge commit '91e8d2eb1f7bf3af949008b106ec1ca037b88b0e'

* commit '91e8d2eb1f7bf3af949008b106ec1ca037b88b0e':
lavf: use the format context strict_std_compliance instead of the codec one

Conflicts:
libavformat/mux.c

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

libavformat/movenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/mux.c	diff1 \|	diff2 \|	blob \| history

FFmpeg git repo

libavformat/movenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/mux.c	diff1 \|	diff2 \|	blob \| history