eden-emu/FFmpeg
19
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge commit 'a5f8873620'

Browse source 
* commit 'a5f8873620':
  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
commit 0104570fb6
13 changed files with 20 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libavformat/utils.c
View file

@ -876,7 +876,7 @@ int ff_get_audio_frame_size(AVCodecContext *enc, int size, int mux)
if ((frame_size = av_get_audio_frame_duration(enc, size)) > 0)
return frame_size;
/* fallback to using frame_size if muxing */
/* Fall back on using frame_size if muxing. */
if (enc->frame_size > 1)
return enc->frame_size;
@ -2179,8 +2179,8 @@ int avformat_seek_file(AVFormatContext *s, int stream_index, int64_t min_ts, int
//try to seek via read_timestamp()
}
//Fallback to old API if new is not implemented but old is
//Note the old has somewhat different semantics
// Fall back on old API if new is not implemented but old is.
// Note the old API has somewhat different semantics.
if (s->iformat->read_seek || 1) {
int dir = (ts - (uint64_t)min_ts > (uint64_t)max_ts - ts ? AVSEEK_FLAG_BACKWARD : 0);
int ret = av_seek_frame(s, stream_index, ts, flags | dir);