diff mbox series

[FFmpeg-devel,v2,1/2] adtsenc: Add ability to write MPEG2 ID

Message ID 20200829115714.17168-1-epirat07@gmail.com
State Accepted
Commit ff4cc8c65458eb4494a0a1a8ff136dcf85a0f4d0
Headers show
Series [FFmpeg-devel] adtsenc: Add ability to specify MPEG ID | expand

Checks

Context Check Description
andriy/default pending
andriy/make success Make finished
andriy/make_fate success Make fate finished

Commit Message

Marvin Scholz Aug. 29, 2020, 11:57 a.m. UTC 
---
 libavformat/adtsenc.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Kieran Kunhya Aug. 29, 2020, 4:36 p.m. UTC | #1 
On Sat, 29 Aug 2020 at 13:27, Marvin Scholz <epirat07@gmail.com> wrote:

> ---
>  libavformat/adtsenc.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>

Ok
Michael Niedermayer Aug. 30, 2020, 2:08 p.m. UTC | #2 
On Sat, Aug 29, 2020 at 05:36:45PM +0100, Kieran Kunhya wrote:
> On Sat, 29 Aug 2020 at 13:27, Marvin Scholz <epirat07@gmail.com> wrote:
> 
> > ---
> >  libavformat/adtsenc.c | 4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> >
> 
> Ok

will apply

thx

[...]
diff mbox series

Patch

diff --git a/libavformat/adtsenc.c b/libavformat/adtsenc.c
index 9e285752eb..44ff5a70ee 100644
--- a/libavformat/adtsenc.c
+++ b/libavformat/adtsenc.c
@@ -40,6 +40,7 @@  typedef struct ADTSContext {
     int pce_size;
     int apetag;
     int id3v2tag;
+    int mpeg_id;
     uint8_t pce_data[MAX_PCE_SIZE];
 } ADTSContext;
 
@@ -136,7 +137,7 @@  static int adts_write_frame_header(ADTSContext *ctx,
 
     /* adts_fixed_header */
     put_bits(&pb, 12, 0xfff);   /* syncword */
-    put_bits(&pb, 1, 0);        /* ID */
+    put_bits(&pb, 1, ctx->mpeg_id); /* ID */
     put_bits(&pb, 2, 0);        /* layer */
     put_bits(&pb, 1, 1);        /* protection_absent */
     put_bits(&pb, 2, ctx->objecttype); /* profile_objecttype */
@@ -214,6 +215,7 @@  static int adts_write_trailer(AVFormatContext *s)
 static const AVOption options[] = {
     { "write_id3v2",  "Enable ID3v2 tag writing", OFFSET(id3v2tag), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, ENC},
     { "write_apetag", "Enable APE tag writing",   OFFSET(apetag),   AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, ENC},
+    { "write_mpeg2",  "Use MPE2 ID when writing", OFFSET(mpeg_id),  AV_OPT_TYPE_BOOL,  {.i64 = 0}, 0, 1, ENC, "mpeg_id"},
     { NULL },
 };