[FFmpeg-cvslog] avcodec: use designated initializers for bitstream filters

Paul B Mahol git at videolan.org
Wed Oct 2 19:24:03 CEST 2013


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Wed Oct  2 17:20:29 2013 +0000| [2490996f38e02da28397631b11c6b3db8ba25934] | committer: Paul B Mahol

avcodec: use designated initializers for bitstream filters

Signed-off-by: Paul B Mahol <onemda at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2490996f38e02da28397631b11c6b3db8ba25934
---

 libavcodec/aac_adtstoasc_bsf.c         |    6 +++---
 libavcodec/chomp_bsf.c                 |    5 ++---
 libavcodec/dump_extradata_bsf.c        |    5 ++---
 libavcodec/h264_mp4toannexb_bsf.c      |    6 +++---
 libavcodec/imx_dump_header_bsf.c       |    5 ++---
 libavcodec/mjpega_dump_header_bsf.c    |    5 ++---
 libavcodec/movsub_bsf.c                |   10 ++++------
 libavcodec/mp3_header_compress_bsf.c   |    5 ++---
 libavcodec/mp3_header_decompress_bsf.c |    5 ++---
 libavcodec/noise_bsf.c                 |    6 +++---
 libavcodec/remove_extradata_bsf.c      |    5 ++---
 11 files changed, 27 insertions(+), 36 deletions(-)

diff --git a/libavcodec/aac_adtstoasc_bsf.c b/libavcodec/aac_adtstoasc_bsf.c
index c7d7b3a..c8f9e0a 100644
--- a/libavcodec/aac_adtstoasc_bsf.c
+++ b/libavcodec/aac_adtstoasc_bsf.c
@@ -112,7 +112,7 @@ static int aac_adtstoasc_filter(AVBitStreamFilterContext *bsfc,
 }
 
 AVBitStreamFilter ff_aac_adtstoasc_bsf = {
-    "aac_adtstoasc",
-    sizeof(AACBSFContext),
-    aac_adtstoasc_filter,
+    .name           = "aac_adtstoasc",
+    .priv_data_size = sizeof(AACBSFContext),
+    .filter         = aac_adtstoasc_filter,
 };
diff --git a/libavcodec/chomp_bsf.c b/libavcodec/chomp_bsf.c
index eaefaaa..2b93fa9 100644
--- a/libavcodec/chomp_bsf.c
+++ b/libavcodec/chomp_bsf.c
@@ -41,7 +41,6 @@ static int chomp_filter(AVBitStreamFilterContext *bsfc,
  * This filter removes a string of NULL bytes from the end of a packet.
  */
 AVBitStreamFilter ff_chomp_bsf = {
-    "chomp",
-    0,
-    chomp_filter,
+    .name   = "chomp",
+    .filter = chomp_filter,
 };
diff --git a/libavcodec/dump_extradata_bsf.c b/libavcodec/dump_extradata_bsf.c
index 94b7b42..2dcbf8f 100644
--- a/libavcodec/dump_extradata_bsf.c
+++ b/libavcodec/dump_extradata_bsf.c
@@ -47,7 +47,6 @@ static int dump_extradata(AVBitStreamFilterContext *bsfc, AVCodecContext *avctx,
 }
 
 AVBitStreamFilter ff_dump_extradata_bsf={
-    "dump_extra",
-    0,
-    dump_extradata,
+    .name   = "dump_extra",
+    .filter = dump_extradata,
 };
diff --git a/libavcodec/h264_mp4toannexb_bsf.c b/libavcodec/h264_mp4toannexb_bsf.c
index 6ca0100..58568a7 100644
--- a/libavcodec/h264_mp4toannexb_bsf.c
+++ b/libavcodec/h264_mp4toannexb_bsf.c
@@ -205,7 +205,7 @@ fail:
 }
 
 AVBitStreamFilter ff_h264_mp4toannexb_bsf = {
-    "h264_mp4toannexb",
-    sizeof(H264BSFContext),
-    h264_mp4toannexb_filter,
+    .name           = "h264_mp4toannexb",
+    .priv_data_size = sizeof(H264BSFContext),
+    .filter         = h264_mp4toannexb_filter,
 };
diff --git a/libavcodec/imx_dump_header_bsf.c b/libavcodec/imx_dump_header_bsf.c
index 9f276bc..be43fbc 100644
--- a/libavcodec/imx_dump_header_bsf.c
+++ b/libavcodec/imx_dump_header_bsf.c
@@ -53,7 +53,6 @@ static int imx_dump_header(AVBitStreamFilterContext *bsfc, AVCodecContext *avctx
 }
 
 AVBitStreamFilter ff_imx_dump_header_bsf = {
-    "imxdump",
-    0,
-    imx_dump_header,
+    .name   = "imxdump",
+    .filter = imx_dump_header,
 };
diff --git a/libavcodec/mjpega_dump_header_bsf.c b/libavcodec/mjpega_dump_header_bsf.c
index 9de6ac3..3947c82 100644
--- a/libavcodec/mjpega_dump_header_bsf.c
+++ b/libavcodec/mjpega_dump_header_bsf.c
@@ -88,7 +88,6 @@ static int mjpega_dump_header(AVBitStreamFilterContext *bsfc, AVCodecContext *av
 }
 
 AVBitStreamFilter ff_mjpega_dump_header_bsf = {
-    "mjpegadump",
-    0,
-    mjpega_dump_header,
+    .name   = "mjpegadump",
+    .filter = mjpega_dump_header,
 };
diff --git a/libavcodec/movsub_bsf.c b/libavcodec/movsub_bsf.c
index a745190..123c7a5 100644
--- a/libavcodec/movsub_bsf.c
+++ b/libavcodec/movsub_bsf.c
@@ -35,9 +35,8 @@ static int text2movsub(AVBitStreamFilterContext *bsfc, AVCodecContext *avctx, co
 }
 
 AVBitStreamFilter ff_text2movsub_bsf={
-    "text2movsub",
-    0,
-    text2movsub,
+    .name   = "text2movsub",
+    .filter = text2movsub,
 };
 
 static int mov2textsub(AVBitStreamFilterContext *bsfc, AVCodecContext *avctx, const char *args,
@@ -51,7 +50,6 @@ static int mov2textsub(AVBitStreamFilterContext *bsfc, AVCodecContext *avctx, co
 }
 
 AVBitStreamFilter ff_mov2textsub_bsf={
-    "mov2textsub",
-    0,
-    mov2textsub,
+    .name   = "mov2textsub",
+    .filter = mov2textsub,
 };
diff --git a/libavcodec/mp3_header_compress_bsf.c b/libavcodec/mp3_header_compress_bsf.c
index 3c5e2fb..e479f6b 100644
--- a/libavcodec/mp3_header_compress_bsf.c
+++ b/libavcodec/mp3_header_compress_bsf.c
@@ -82,7 +82,6 @@ output_unchanged:
 }
 
 AVBitStreamFilter ff_mp3_header_compress_bsf={
-    "mp3comp",
-    0,
-    mp3_header_compress,
+    .name   = "mp3comp",
+    .filter = mp3_header_compress,
 };
diff --git a/libavcodec/mp3_header_decompress_bsf.c b/libavcodec/mp3_header_decompress_bsf.c
index adf5a7f..df45532 100644
--- a/libavcodec/mp3_header_decompress_bsf.c
+++ b/libavcodec/mp3_header_decompress_bsf.c
@@ -92,7 +92,6 @@ static int mp3_header_decompress(AVBitStreamFilterContext *bsfc, AVCodecContext
 }
 
 AVBitStreamFilter ff_mp3_header_decompress_bsf={
-    "mp3decomp",
-    0,
-    mp3_header_decompress,
+    .name   = "mp3decomp",
+    .filter = mp3_header_decompress,
 };
diff --git a/libavcodec/noise_bsf.c b/libavcodec/noise_bsf.c
index c91e85b..4f609de 100644
--- a/libavcodec/noise_bsf.c
+++ b/libavcodec/noise_bsf.c
@@ -49,7 +49,7 @@ static int noise(AVBitStreamFilterContext *bsfc, AVCodecContext *avctx, const ch
 }
 
 AVBitStreamFilter ff_noise_bsf={
-    "noise",
-    sizeof(int),
-    noise,
+    .name           = "noise",
+    .priv_data_size = sizeof(int),
+    .filter         = noise,
 };
diff --git a/libavcodec/remove_extradata_bsf.c b/libavcodec/remove_extradata_bsf.c
index f0d9b45..e880b95 100644
--- a/libavcodec/remove_extradata_bsf.c
+++ b/libavcodec/remove_extradata_bsf.c
@@ -49,7 +49,6 @@ static int remove_extradata(AVBitStreamFilterContext *bsfc, AVCodecContext *avct
 }
 
 AVBitStreamFilter ff_remove_extradata_bsf={
-    "remove_extra",
-    0,
-    remove_extradata,
+    .name   = "remove_extra",
+    .filter = remove_extradata,
 };



More information about the ffmpeg-cvslog mailing list