diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-11 15:24:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-11 15:24:22 +0200 |
| commit | ec7946853a24855cc4e889f788195f57ce59ccab (patch) | |
| tree | 323a8434157c2136b0ebd5e563bb0b566ac5bb8c /libavformat/flvdec.c | |
| parent | 7b56dddd565438e5c9a9bfcd0a55e087ce0800fe (diff) | |
| parent | 55e778bebd6352977eebe406b522e2e9aed7ce35 (diff) | |
| download | ffmpeg-ec7946853a24855cc4e889f788195f57ce59ccab.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtpdec_jpeg: Add support for default quantizers
x86: dsputil: Move specific optimization settings out of global init function
avplay: get rid of ugly casts in the options table
avplay: fix prototypes for option callbacks.
flvdec: always set AVFMTCTX_NOHEADER.
file: Use a normal private context for storing the file descriptor
configure: Adjust the xgetbv instrinsic check
configure: Add --disable-inline-asm command line option
configure: Don't try to enable the log2 function on msvcrt
Conflicts:
configure
ffplay.c
libavcodec/x86/dsputil_mmx.c
libavformat/file.c
libavformat/flvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/flvdec.c')
| -rw-r--r-- | libavformat/flvdec.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 48750473b2..8c6807a260 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -503,7 +503,8 @@ static int flv_read_header(AVFormatContext *s) flags = FLV_HEADER_FLAG_HASVIDEO | FLV_HEADER_FLAG_HASAUDIO; av_log(s, AV_LOG_WARNING, "Broken FLV file, which says no streams present, this might fail\n"); } - s->ctx_flags |= AVFMTCTX_NOHEADER; + + s->ctx_flags |= AVFMTCTX_NOHEADER; if(flags & FLV_HEADER_FLAG_HASVIDEO){ if(!create_stream(s, AVMEDIA_TYPE_VIDEO)) @@ -729,6 +730,7 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt) av_log(s, AV_LOG_WARNING, "Stream discovered after head already parsed\n"); st = create_stream(s, (int[]){AVMEDIA_TYPE_VIDEO, AVMEDIA_TYPE_AUDIO, AVMEDIA_TYPE_DATA}[stream_type]); + } av_dlog(s, "%d %X %d \n", stream_type, flags, st->discard); if( (st->discard >= AVDISCARD_NONKEY && !((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY || (stream_type == FLV_STREAM_TYPE_AUDIO))) |