eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-12 10:00:08 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
4c91599484e115e9b51c884fc46cea3f8511f8ae
ffmpeg/libavformat/oggparsecelt.c
Michael Niedermayer d52f874c7f Merge commit 'b8604a976128ffbd316653cdec11ba487f1025bb' 
* commit 'b8604a976128ffbd316653cdec11ba487f1025bb':
  oggparsecelt: do not set AVCodecContext.frame_size

Conflicts:
	libavformat/oggparsecelt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-09 22:48:25 +02:00

2.9 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink