opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-03-13 09:00:40 +08:00
Code Issues Packages Projects Releases Wiki Activity
Files
2ece7d94bc35ba0ee2b650caec25853b9fcc2eb7
FFmpeg/libavcodec/mace.c
Michael Niedermayer 7163bbefa2 Merge commit 'e1f3847f860a1094a46be4c5f10db8df616c3135' 
* commit 'e1f3847f860a1094a46be4c5f10db8df616c3135':
  mace: Make sure that the channel count is set to a valid value

Conflicts:
	libavcodec/mace.c

See: 6df1cfa7e4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-17 15:16:01 +02:00

13 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink