breeze/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-02-04 14:30:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
Files
dea377fcc0cbb2ffe4b1be860d2e207da28b098a
FFmpeg/libavcodec/mlp_parser.c
Michael Niedermayer 4040b56f5a Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mlp_parser: fix request_channel_layout behavior.

Conflicts:
	libavcodec/mlp_parser.c

See: bd35d58463
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-09 02:37:17 +01:00

13 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink