diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-22 20:49:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-22 20:49:16 +0200 |
| commit | bc373595f28e20f69505dd0d29f716935c06f958 (patch) | |
| tree | b7345bd4fb15fc77cb1c01b4eb9edf0f72ccf454 | |
| parent | d5227ceff13e52eddf1fd02e0042ebc9aa628791 (diff) | |
| parent | 6f54dc43cee6b2f5d183acf98b32a3cf8be4a4fc (diff) | |
Merge commit '6f54dc43cee6b2f5d183acf98b32a3cf8be4a4fc'
* commit '6f54dc43cee6b2f5d183acf98b32a3cf8be4a4fc':
mpegvideo: Drop stream_codec_tag
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/mpegvideo.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index fd56eb4712..0617eee573 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -249,7 +249,6 @@ typedef struct MpegEncContext { int strict_std_compliance; ///< strictly follow the std (MPEG4, ...) int workaround_bugs; ///< workaround bugs in encoders which cannot be detected automatically int codec_tag; ///< internal codec_tag upper case converted from avctx codec_tag - int stream_codec_tag; ///< internal stream_codec_tag upper case converted from avctx stream_codec_tag /* the following fields are managed internally by the encoder */ /* sequence parameters */ |