apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-10-22 00:20:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'ca1fe6c0e60808da45d4dfd8728f45e843b9f9b0'

Browse Source 
* commit 'ca1fe6c0e60808da45d4dfd8728f45e843b9f9b0':
  h263: remove an unused parameter from ff_h263_decode_init_vlc
  flac: add channel layout masks for streams with 7 or 8 channels.
  flac: don't check the number of channels before setting the channel layout.

Conflicts:
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-02-07 13:42:56 +01:00
parent 60a0bc46cd ca1fe6c0e6
commit d5518545d1
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/rv10.c
View File

@@ -505,7 +505,7 @@ static av_cold int rv10_decode_init(AVCodecContext *avctx)
if (ff_MPV_common_init(s) < 0)
return -1;
ff_h263_decode_init_vlc(s);
ff_h263_decode_init_vlc();
/* init rv vlc */
if (!done) {