Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2016-09-27 16:10:44 +0300
committerJames Almer <jamrial@gmail.com>2016-09-27 16:42:51 +0300
commit4a05d2eda7215fcadbebec8f4656bbb71574567e (patch)
tree03dd827febe894f4d5e0a5e12f6cf4a523d8453d /ffmpeg.h
parentf0b6f7253f3e69a475722b8f0b0e4289201245bf (diff)
ffmpeg: stop using AVStream.codec on stream copy
This commit is based on commit 35c8580 from Anton Khirnov <anton@khirnov.net> which was skipped in b8945c4. The avcodec_copy_context() call in the encode path is left in place for now as AVStream.codec is apparently still required even after porting ffmpeg to the new bsf API. Tested-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'ffmpeg.h')
-rw-r--r--ffmpeg.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/ffmpeg.h b/ffmpeg.h
index b7f8b7a146..0d01d2bab7 100644
--- a/ffmpeg.h
+++ b/ffmpeg.h
@@ -477,6 +477,7 @@ typedef struct OutputStream {
int keep_pix_fmt;
AVCodecParserContext *parser;
+ AVCodecContext *parser_avctx;
/* stats */
// combined size of all the packets written