eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-05 21:55:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7'

Browse Source 
* commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7':
  silly typo fixes

Conflicts:
	doc/protocols.texi
	libavcodec/aacpsy.c
	libavformat/utils.c
	tools/patcheck

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-05-04 10:17:52 +02:00
parent 711c8ee71d a5f8873620
commit 0104570fb6
13 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/flacenc.c
View File

@@ -1259,7 +1259,7 @@ static int flac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
frame_bytes = encode_frame(s);
/* fallback to verbatim mode if the compressed frame is larger than it
/* Fall back on verbatim mode if the compressed frame is larger than it
would be if encoded uncompressed. */
if (frame_bytes < 0 || frame_bytes > s->max_framesize) {
s->frame.verbatim_only = 1;