git.sesse.net Git - ffmpeg/commit

]> git.sesse.net Git - ffmpeg/commit

author	Michael Niedermayer <michaelni@gmx.at>
	Sun, 5 Jan 2014 21:53:13 +0000 (22:53 +0100)
committer	Michael Niedermayer <michaelni@gmx.at>
	Sun, 5 Jan 2014 21:53:13 +0000 (22:53 +0100)
commit	b4107f7805be6699d4b38449b1f9235958a2a133
tree	a0403f61442e8d2dff1d66c5577d8cfae861f30e	tree \| snapshot
parent	ae01af24756d6f5bd13eef405ca19a8bf458b39f	commit \| diff
parent	4b7f1a7ced0e98f2cc698d896f7ebab8d30eaa09	commit \| diff

Merge commit '4b7f1a7ced0e98f2cc698d896f7ebab8d30eaa09'

* commit '4b7f1a7ced0e98f2cc698d896f7ebab8d30eaa09':
mlp: Parse TrueHD decoder channel modifiers and set the AVMatrixEncoding for each substream.

Conflicts:
libavcodec/mlp_parser.h
libavcodec/mlpdec.c

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

libavcodec/mlp.h	diff1 \|	diff2 \|	blob \| history
libavcodec/mlp_parser.c	diff1 \|	diff2 \|	blob \| history
libavcodec/mlp_parser.h	diff1 \|	diff2 \|	blob \| history
libavcodec/mlpdec.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

libavcodec/mlp.h	diff1 \|	diff2 \|	blob \| history
libavcodec/mlp_parser.c	diff1 \|	diff2 \|	blob \| history
libavcodec/mlp_parser.h	diff1 \|	diff2 \|	blob \| history
libavcodec/mlpdec.c	diff1 \|	diff2 \|	blob \| history