| Message ID | 69f7492f-17b1-28f2-d0bb-9d1232e8e4b5@jkqxz.net |
|---|---|
| State | Accepted |
| Commit | 10bcc41bb40ba479bfc5ad29b1650a6b335437a8 |
| Headers | show |
On 2018/2/8 3:44, Mark Thompson wrote: > --- > doc/examples/avio_dir_cmd.c | 2 -- > doc/examples/avio_reading.c | 3 --- > doc/examples/decode_audio.c | 3 --- > doc/examples/decode_video.c | 2 -- > doc/examples/demuxing_decoding.c | 3 --- > doc/examples/encode_audio.c | 3 --- > doc/examples/encode_video.c | 2 -- > doc/examples/extract_mvs.c | 2 -- > doc/examples/filtering_audio.c | 1 - > doc/examples/filtering_video.c | 1 - > doc/examples/http_multiclient.c | 1 - > doc/examples/hw_decode.c | 2 -- > doc/examples/metadata.c | 1 - > doc/examples/muxing.c | 3 --- > doc/examples/qsvdec.c | 2 -- > doc/examples/remuxing.c | 2 -- > doc/examples/transcode_aac.c | 2 -- > doc/examples/transcoding.c | 1 - > doc/examples/vaapi_encode.c | 2 -- > doc/examples/vaapi_transcode.c | 2 -- > 20 files changed, 40 deletions(-) > > diff --git a/doc/examples/avio_dir_cmd.c b/doc/examples/avio_dir_cmd.c > index 50c435cf8f..0722bd9ab1 100644 > --- a/doc/examples/avio_dir_cmd.c > +++ b/doc/examples/avio_dir_cmd.c > @@ -143,8 +143,6 @@ int main(int argc, char *argv[]) > return 1; > } > > - /* register codecs and formats and other lavf/lavc components*/ > - av_register_all(); > avformat_network_init(); > > op = argv[1]; > diff --git a/doc/examples/avio_reading.c b/doc/examples/avio_reading.c > index 7860fd5e2f..cbfeb174b8 100644 > --- a/doc/examples/avio_reading.c > +++ b/doc/examples/avio_reading.c > @@ -74,9 +74,6 @@ int main(int argc, char *argv[]) > } > input_filename = argv[1]; > > - /* register codecs and formats and other lavf/lavc components*/ > - av_register_all(); > - > /* slurp file content into buffer */ > ret = av_file_map(input_filename, &buffer, &buffer_size, 0, NULL); > if (ret < 0) > diff --git a/doc/examples/decode_audio.c b/doc/examples/decode_audio.c > index fb9a9af2f6..19dcafd2c8 100644 > --- a/doc/examples/decode_audio.c > +++ b/doc/examples/decode_audio.c > @@ -94,9 +94,6 @@ int main(int argc, char **argv) > filename = argv[1]; > outfilename = argv[2]; > > - /* register all the codecs */ > - avcodec_register_all(); > - > pkt = av_packet_alloc(); > > /* find the MPEG audio decoder */ > diff --git a/doc/examples/decode_video.c b/doc/examples/decode_video.c > index 4377fd49e0..5a9d43f689 100644 > --- a/doc/examples/decode_video.c > +++ b/doc/examples/decode_video.c > @@ -101,8 +101,6 @@ int main(int argc, char **argv) > filename = argv[1]; > outfilename = argv[2]; > > - avcodec_register_all(); > - > pkt = av_packet_alloc(); > if (!pkt) > exit(1); > diff --git a/doc/examples/demuxing_decoding.c b/doc/examples/demuxing_decoding.c > index b1a216abb4..69a31a8935 100644 > --- a/doc/examples/demuxing_decoding.c > +++ b/doc/examples/demuxing_decoding.c > @@ -252,9 +252,6 @@ int main (int argc, char **argv) > video_dst_filename = argv[2]; > audio_dst_filename = argv[3]; > > - /* register all formats and codecs */ > - av_register_all(); > - > /* open input file, and allocate format context */ > if (avformat_open_input(&fmt_ctx, src_filename, NULL, NULL) < 0) { > fprintf(stderr, "Could not open source file %s\n", src_filename); > diff --git a/doc/examples/encode_audio.c b/doc/examples/encode_audio.c > index d1ef105d9d..ab3586be7f 100644 > --- a/doc/examples/encode_audio.c > +++ b/doc/examples/encode_audio.c > @@ -138,9 +138,6 @@ int main(int argc, char **argv) > } > filename = argv[1]; > > - /* register all the codecs */ > - avcodec_register_all(); > - > /* find the MP2 encoder */ > codec = avcodec_find_encoder(AV_CODEC_ID_MP2); > if (!codec) { > diff --git a/doc/examples/encode_video.c b/doc/examples/encode_video.c > index 8cd13219bb..6731b2ad19 100644 > --- a/doc/examples/encode_video.c > +++ b/doc/examples/encode_video.c > @@ -84,8 +84,6 @@ int main(int argc, char **argv) > filename = argv[1]; > codec_name = argv[2]; > > - avcodec_register_all(); > - > /* find the mpeg1video encoder */ > codec = avcodec_find_encoder_by_name(codec_name); > if (!codec) { > diff --git a/doc/examples/extract_mvs.c b/doc/examples/extract_mvs.c > index 7ae934ead3..de31ccd2b9 100644 > --- a/doc/examples/extract_mvs.c > +++ b/doc/examples/extract_mvs.c > @@ -129,8 +129,6 @@ int main(int argc, char **argv) > } > src_filename = argv[1]; > > - av_register_all(); > - > if (avformat_open_input(&fmt_ctx, src_filename, NULL, NULL) < 0) { > fprintf(stderr, "Could not open source file %s\n", src_filename); > exit(1); > diff --git a/doc/examples/filtering_audio.c b/doc/examples/filtering_audio.c > index 18d6ca275c..73a00e814c 100644 > --- a/doc/examples/filtering_audio.c > +++ b/doc/examples/filtering_audio.c > @@ -228,7 +228,6 @@ int main(int argc, char **argv) > exit(1); > } > > - av_register_all(); > avfilter_register_all(); > > if ((ret = open_input_file(argv[1])) < 0) > diff --git a/doc/examples/filtering_video.c b/doc/examples/filtering_video.c > index 9b607ba016..01d6644620 100644 > --- a/doc/examples/filtering_video.c > +++ b/doc/examples/filtering_video.c > @@ -222,7 +222,6 @@ int main(int argc, char **argv) > exit(1); > } > > - av_register_all(); > avfilter_register_all(); > > if ((ret = open_input_file(argv[1])) < 0) > diff --git a/doc/examples/http_multiclient.c b/doc/examples/http_multiclient.c > index e2c2201a08..831e89c60a 100644 > --- a/doc/examples/http_multiclient.c > +++ b/doc/examples/http_multiclient.c > @@ -114,7 +114,6 @@ int main(int argc, char **argv) > in_uri = argv[1]; > out_uri = argv[2]; > > - av_register_all(); > avformat_network_init(); > > if ((ret = av_dict_set(&options, "listen", "2", 0)) < 0) { > diff --git a/doc/examples/hw_decode.c b/doc/examples/hw_decode.c > index 83a5808bf7..14fe08b374 100644 > --- a/doc/examples/hw_decode.c > +++ b/doc/examples/hw_decode.c > @@ -163,8 +163,6 @@ int main(int argc, char *argv[]) > return -1; > } > > - av_register_all(); > - > type = av_hwdevice_find_type_by_name(argv[1]); > if (type == AV_HWDEVICE_TYPE_NONE) { > fprintf(stderr, "Device type %s is not supported.\n", argv[1]); > diff --git a/doc/examples/metadata.c b/doc/examples/metadata.c > index f73c267369..e330d077a9 100644 > --- a/doc/examples/metadata.c > +++ b/doc/examples/metadata.c > @@ -44,7 +44,6 @@ int main (int argc, char **argv) > return 1; > } > > - av_register_all(); > if ((ret = avformat_open_input(&fmt_ctx, argv[1], NULL, NULL))) > return ret; > > diff --git a/doc/examples/muxing.c b/doc/examples/muxing.c > index 6b98a3b2a0..08da98e574 100644 > --- a/doc/examples/muxing.c > +++ b/doc/examples/muxing.c > @@ -564,9 +564,6 @@ int main(int argc, char **argv) > AVDictionary *opt = NULL; > int i; > > - /* Initialize libavcodec, and register all codecs and formats. */ > - av_register_all(); > - > if (argc < 2) { > printf("usage: %s output_file\n" > "API example program to output a media file with libavformat.\n" > diff --git a/doc/examples/qsvdec.c b/doc/examples/qsvdec.c > index cede6153be..7415eefca5 100644 > --- a/doc/examples/qsvdec.c > +++ b/doc/examples/qsvdec.c > @@ -150,8 +150,6 @@ int main(int argc, char **argv) > > int ret, i; > > - av_register_all(); > - > if (argc < 3) { > fprintf(stderr, "Usage: %s <input file> <output file>\n", argv[0]); > return 1; > diff --git a/doc/examples/remuxing.c b/doc/examples/remuxing.c > index 59594181a7..9e4d1031b4 100644 > --- a/doc/examples/remuxing.c > +++ b/doc/examples/remuxing.c > @@ -65,8 +65,6 @@ int main(int argc, char **argv) > in_filename = argv[1]; > out_filename = argv[2]; > > - av_register_all(); > - > if ((ret = avformat_open_input(&ifmt_ctx, in_filename, 0, 0)) < 0) { > fprintf(stderr, "Could not open input file '%s'", in_filename); > goto end; > diff --git a/doc/examples/transcode_aac.c b/doc/examples/transcode_aac.c > index 3c7688cd33..b19349573a 100644 > --- a/doc/examples/transcode_aac.c > +++ b/doc/examples/transcode_aac.c > @@ -753,8 +753,6 @@ int main(int argc, char **argv) > exit(1); > } > > - /* Register all codecs and formats so that they can be used. */ > - av_register_all(); > /* Open the input file for reading. */ > if (open_input_file(argv[1], &input_format_context, > &input_codec_context)) > diff --git a/doc/examples/transcoding.c b/doc/examples/transcoding.c > index e32ab20245..ed1fd6411b 100644 > --- a/doc/examples/transcoding.c > +++ b/doc/examples/transcoding.c > @@ -517,7 +517,6 @@ int main(int argc, char **argv) > return 1; > } > > - av_register_all(); > avfilter_register_all(); > > if ((ret = open_input_file(argv[1])) < 0) > diff --git a/doc/examples/vaapi_encode.c b/doc/examples/vaapi_encode.c > index 6425b1c98c..3bdc62bef3 100644 > --- a/doc/examples/vaapi_encode.c > +++ b/doc/examples/vaapi_encode.c > @@ -125,8 +125,6 @@ int main(int argc, char *argv[]) > goto close; > } > > - avcodec_register_all(); > - > err = av_hwdevice_ctx_create(&hw_device_ctx, AV_HWDEVICE_TYPE_VAAPI, > NULL, NULL, 0); > if (err < 0) { > diff --git a/doc/examples/vaapi_transcode.c b/doc/examples/vaapi_transcode.c > index 6318895af3..649f48b97c 100644 > --- a/doc/examples/vaapi_transcode.c > +++ b/doc/examples/vaapi_transcode.c > @@ -238,8 +238,6 @@ int main(int argc, char **argv) > return -1; > } > > - av_register_all(); > - > ret = av_hwdevice_ctx_create(&hw_device_ctx, AV_HWDEVICE_TYPE_VAAPI, NULL, NULL, 0); > if (ret < 0) { > fprintf(stderr, "Failed to create a VAAPI device. Error code: %s\n", av_err2str(ret)); LGTM, but why don't clean the other part,e,g ffmpeg.c/ffplay.c/ffprobe.c/... at the same time.
On 2/8/2018 10:41 PM, Jun Zhao wrote: > > > On 2018/2/8 3:44, Mark Thompson wrote: >> --- >> doc/examples/avio_dir_cmd.c | 2 -- >> doc/examples/avio_reading.c | 3 --- >> doc/examples/decode_audio.c | 3 --- >> doc/examples/decode_video.c | 2 -- >> doc/examples/demuxing_decoding.c | 3 --- >> doc/examples/encode_audio.c | 3 --- >> doc/examples/encode_video.c | 2 -- >> doc/examples/extract_mvs.c | 2 -- >> doc/examples/filtering_audio.c | 1 - >> doc/examples/filtering_video.c | 1 - >> doc/examples/http_multiclient.c | 1 - >> doc/examples/hw_decode.c | 2 -- >> doc/examples/metadata.c | 1 - >> doc/examples/muxing.c | 3 --- >> doc/examples/qsvdec.c | 2 -- >> doc/examples/remuxing.c | 2 -- >> doc/examples/transcode_aac.c | 2 -- >> doc/examples/transcoding.c | 1 - >> doc/examples/vaapi_encode.c | 2 -- >> doc/examples/vaapi_transcode.c | 2 -- >> 20 files changed, 40 deletions(-) >> >> diff --git a/doc/examples/avio_dir_cmd.c b/doc/examples/avio_dir_cmd.c >> index 50c435cf8f..0722bd9ab1 100644 >> --- a/doc/examples/avio_dir_cmd.c >> +++ b/doc/examples/avio_dir_cmd.c >> @@ -143,8 +143,6 @@ int main(int argc, char *argv[]) >> return 1; >> } >> >> - /* register codecs and formats and other lavf/lavc components*/ >> - av_register_all(); >> avformat_network_init(); >> >> op = argv[1]; >> diff --git a/doc/examples/avio_reading.c b/doc/examples/avio_reading.c >> index 7860fd5e2f..cbfeb174b8 100644 >> --- a/doc/examples/avio_reading.c >> +++ b/doc/examples/avio_reading.c >> @@ -74,9 +74,6 @@ int main(int argc, char *argv[]) >> } >> input_filename = argv[1]; >> >> - /* register codecs and formats and other lavf/lavc components*/ >> - av_register_all(); >> - >> /* slurp file content into buffer */ >> ret = av_file_map(input_filename, &buffer, &buffer_size, 0, NULL); >> if (ret < 0) >> diff --git a/doc/examples/decode_audio.c b/doc/examples/decode_audio.c >> index fb9a9af2f6..19dcafd2c8 100644 >> --- a/doc/examples/decode_audio.c >> +++ b/doc/examples/decode_audio.c >> @@ -94,9 +94,6 @@ int main(int argc, char **argv) >> filename = argv[1]; >> outfilename = argv[2]; >> >> - /* register all the codecs */ >> - avcodec_register_all(); >> - >> pkt = av_packet_alloc(); >> >> /* find the MPEG audio decoder */ >> diff --git a/doc/examples/decode_video.c b/doc/examples/decode_video.c >> index 4377fd49e0..5a9d43f689 100644 >> --- a/doc/examples/decode_video.c >> +++ b/doc/examples/decode_video.c >> @@ -101,8 +101,6 @@ int main(int argc, char **argv) >> filename = argv[1]; >> outfilename = argv[2]; >> >> - avcodec_register_all(); >> - >> pkt = av_packet_alloc(); >> if (!pkt) >> exit(1); >> diff --git a/doc/examples/demuxing_decoding.c b/doc/examples/demuxing_decoding.c >> index b1a216abb4..69a31a8935 100644 >> --- a/doc/examples/demuxing_decoding.c >> +++ b/doc/examples/demuxing_decoding.c >> @@ -252,9 +252,6 @@ int main (int argc, char **argv) >> video_dst_filename = argv[2]; >> audio_dst_filename = argv[3]; >> >> - /* register all formats and codecs */ >> - av_register_all(); >> - >> /* open input file, and allocate format context */ >> if (avformat_open_input(&fmt_ctx, src_filename, NULL, NULL) < 0) { >> fprintf(stderr, "Could not open source file %s\n", src_filename); >> diff --git a/doc/examples/encode_audio.c b/doc/examples/encode_audio.c >> index d1ef105d9d..ab3586be7f 100644 >> --- a/doc/examples/encode_audio.c >> +++ b/doc/examples/encode_audio.c >> @@ -138,9 +138,6 @@ int main(int argc, char **argv) >> } >> filename = argv[1]; >> >> - /* register all the codecs */ >> - avcodec_register_all(); >> - >> /* find the MP2 encoder */ >> codec = avcodec_find_encoder(AV_CODEC_ID_MP2); >> if (!codec) { >> diff --git a/doc/examples/encode_video.c b/doc/examples/encode_video.c >> index 8cd13219bb..6731b2ad19 100644 >> --- a/doc/examples/encode_video.c >> +++ b/doc/examples/encode_video.c >> @@ -84,8 +84,6 @@ int main(int argc, char **argv) >> filename = argv[1]; >> codec_name = argv[2]; >> >> - avcodec_register_all(); >> - >> /* find the mpeg1video encoder */ >> codec = avcodec_find_encoder_by_name(codec_name); >> if (!codec) { >> diff --git a/doc/examples/extract_mvs.c b/doc/examples/extract_mvs.c >> index 7ae934ead3..de31ccd2b9 100644 >> --- a/doc/examples/extract_mvs.c >> +++ b/doc/examples/extract_mvs.c >> @@ -129,8 +129,6 @@ int main(int argc, char **argv) >> } >> src_filename = argv[1]; >> >> - av_register_all(); >> - >> if (avformat_open_input(&fmt_ctx, src_filename, NULL, NULL) < 0) { >> fprintf(stderr, "Could not open source file %s\n", src_filename); >> exit(1); >> diff --git a/doc/examples/filtering_audio.c b/doc/examples/filtering_audio.c >> index 18d6ca275c..73a00e814c 100644 >> --- a/doc/examples/filtering_audio.c >> +++ b/doc/examples/filtering_audio.c >> @@ -228,7 +228,6 @@ int main(int argc, char **argv) >> exit(1); >> } >> >> - av_register_all(); >> avfilter_register_all(); >> >> if ((ret = open_input_file(argv[1])) < 0) >> diff --git a/doc/examples/filtering_video.c b/doc/examples/filtering_video.c >> index 9b607ba016..01d6644620 100644 >> --- a/doc/examples/filtering_video.c >> +++ b/doc/examples/filtering_video.c >> @@ -222,7 +222,6 @@ int main(int argc, char **argv) >> exit(1); >> } >> >> - av_register_all(); >> avfilter_register_all(); >> >> if ((ret = open_input_file(argv[1])) < 0) >> diff --git a/doc/examples/http_multiclient.c b/doc/examples/http_multiclient.c >> index e2c2201a08..831e89c60a 100644 >> --- a/doc/examples/http_multiclient.c >> +++ b/doc/examples/http_multiclient.c >> @@ -114,7 +114,6 @@ int main(int argc, char **argv) >> in_uri = argv[1]; >> out_uri = argv[2]; >> >> - av_register_all(); >> avformat_network_init(); >> >> if ((ret = av_dict_set(&options, "listen", "2", 0)) < 0) { >> diff --git a/doc/examples/hw_decode.c b/doc/examples/hw_decode.c >> index 83a5808bf7..14fe08b374 100644 >> --- a/doc/examples/hw_decode.c >> +++ b/doc/examples/hw_decode.c >> @@ -163,8 +163,6 @@ int main(int argc, char *argv[]) >> return -1; >> } >> >> - av_register_all(); >> - >> type = av_hwdevice_find_type_by_name(argv[1]); >> if (type == AV_HWDEVICE_TYPE_NONE) { >> fprintf(stderr, "Device type %s is not supported.\n", argv[1]); >> diff --git a/doc/examples/metadata.c b/doc/examples/metadata.c >> index f73c267369..e330d077a9 100644 >> --- a/doc/examples/metadata.c >> +++ b/doc/examples/metadata.c >> @@ -44,7 +44,6 @@ int main (int argc, char **argv) >> return 1; >> } >> >> - av_register_all(); >> if ((ret = avformat_open_input(&fmt_ctx, argv[1], NULL, NULL))) >> return ret; >> >> diff --git a/doc/examples/muxing.c b/doc/examples/muxing.c >> index 6b98a3b2a0..08da98e574 100644 >> --- a/doc/examples/muxing.c >> +++ b/doc/examples/muxing.c >> @@ -564,9 +564,6 @@ int main(int argc, char **argv) >> AVDictionary *opt = NULL; >> int i; >> >> - /* Initialize libavcodec, and register all codecs and formats. */ >> - av_register_all(); >> - >> if (argc < 2) { >> printf("usage: %s output_file\n" >> "API example program to output a media file with libavformat.\n" >> diff --git a/doc/examples/qsvdec.c b/doc/examples/qsvdec.c >> index cede6153be..7415eefca5 100644 >> --- a/doc/examples/qsvdec.c >> +++ b/doc/examples/qsvdec.c >> @@ -150,8 +150,6 @@ int main(int argc, char **argv) >> >> int ret, i; >> >> - av_register_all(); >> - >> if (argc < 3) { >> fprintf(stderr, "Usage: %s <input file> <output file>\n", argv[0]); >> return 1; >> diff --git a/doc/examples/remuxing.c b/doc/examples/remuxing.c >> index 59594181a7..9e4d1031b4 100644 >> --- a/doc/examples/remuxing.c >> +++ b/doc/examples/remuxing.c >> @@ -65,8 +65,6 @@ int main(int argc, char **argv) >> in_filename = argv[1]; >> out_filename = argv[2]; >> >> - av_register_all(); >> - >> if ((ret = avformat_open_input(&ifmt_ctx, in_filename, 0, 0)) < 0) { >> fprintf(stderr, "Could not open input file '%s'", in_filename); >> goto end; >> diff --git a/doc/examples/transcode_aac.c b/doc/examples/transcode_aac.c >> index 3c7688cd33..b19349573a 100644 >> --- a/doc/examples/transcode_aac.c >> +++ b/doc/examples/transcode_aac.c >> @@ -753,8 +753,6 @@ int main(int argc, char **argv) >> exit(1); >> } >> >> - /* Register all codecs and formats so that they can be used. */ >> - av_register_all(); >> /* Open the input file for reading. */ >> if (open_input_file(argv[1], &input_format_context, >> &input_codec_context)) >> diff --git a/doc/examples/transcoding.c b/doc/examples/transcoding.c >> index e32ab20245..ed1fd6411b 100644 >> --- a/doc/examples/transcoding.c >> +++ b/doc/examples/transcoding.c >> @@ -517,7 +517,6 @@ int main(int argc, char **argv) >> return 1; >> } >> >> - av_register_all(); >> avfilter_register_all(); >> >> if ((ret = open_input_file(argv[1])) < 0) >> diff --git a/doc/examples/vaapi_encode.c b/doc/examples/vaapi_encode.c >> index 6425b1c98c..3bdc62bef3 100644 >> --- a/doc/examples/vaapi_encode.c >> +++ b/doc/examples/vaapi_encode.c >> @@ -125,8 +125,6 @@ int main(int argc, char *argv[]) >> goto close; >> } >> >> - avcodec_register_all(); >> - >> err = av_hwdevice_ctx_create(&hw_device_ctx, AV_HWDEVICE_TYPE_VAAPI, >> NULL, NULL, 0); >> if (err < 0) { >> diff --git a/doc/examples/vaapi_transcode.c b/doc/examples/vaapi_transcode.c >> index 6318895af3..649f48b97c 100644 >> --- a/doc/examples/vaapi_transcode.c >> +++ b/doc/examples/vaapi_transcode.c >> @@ -238,8 +238,6 @@ int main(int argc, char **argv) >> return -1; >> } >> >> - av_register_all(); >> - >> ret = av_hwdevice_ctx_create(&hw_device_ctx, AV_HWDEVICE_TYPE_VAAPI, NULL, NULL, 0); >> if (ret < 0) { >> fprintf(stderr, "Failed to create a VAAPI device. Error code: %s\n", av_err2str(ret)); > LGTM, but why don't clean the other part,e,g > ffmpeg.c/ffplay.c/ffprobe.c/... at the same time. Separate patches are needed for that. One big "remove this thing from the entire codebase" commit is never good. Makes bisecting for regressions a pain.
On 09/02/18 01:54, James Almer wrote: > On 2/8/2018 10:41 PM, Jun Zhao wrote: >> On 2018/2/8 3:44, Mark Thompson wrote: >>> --- >>> doc/examples/avio_dir_cmd.c | 2 -- >>> doc/examples/avio_reading.c | 3 --- >>> doc/examples/decode_audio.c | 3 --- >>> doc/examples/decode_video.c | 2 -- >>> doc/examples/demuxing_decoding.c | 3 --- >>> doc/examples/encode_audio.c | 3 --- >>> doc/examples/encode_video.c | 2 -- >>> doc/examples/extract_mvs.c | 2 -- >>> doc/examples/filtering_audio.c | 1 - >>> doc/examples/filtering_video.c | 1 - >>> doc/examples/http_multiclient.c | 1 - >>> doc/examples/hw_decode.c | 2 -- >>> doc/examples/metadata.c | 1 - >>> doc/examples/muxing.c | 3 --- >>> doc/examples/qsvdec.c | 2 -- >>> doc/examples/remuxing.c | 2 -- >>> doc/examples/transcode_aac.c | 2 -- >>> doc/examples/transcoding.c | 1 - >>> doc/examples/vaapi_encode.c | 2 -- >>> doc/examples/vaapi_transcode.c | 2 -- >>> 20 files changed, 40 deletions(-) >>> >>> diff --git a/doc/examples/avio_dir_cmd.c b/doc/examples/avio_dir_cmd.c >>> index 50c435cf8f..0722bd9ab1 100644 >>> --- a/doc/examples/avio_dir_cmd.c >>> +++ b/doc/examples/avio_dir_cmd.c >>> @@ -143,8 +143,6 @@ int main(int argc, char *argv[]) >>> return 1; >>> } >>> >>> - /* register codecs and formats and other lavf/lavc components*/ >>> - av_register_all(); >>> avformat_network_init(); >>> >>> op = argv[1]; >>> diff --git a/doc/examples/avio_reading.c b/doc/examples/avio_reading.c >>> index 7860fd5e2f..cbfeb174b8 100644 >>> --- a/doc/examples/avio_reading.c >>> +++ b/doc/examples/avio_reading.c >>> @@ -74,9 +74,6 @@ int main(int argc, char *argv[]) >>> } >>> input_filename = argv[1]; >>> >>> - /* register codecs and formats and other lavf/lavc components*/ >>> - av_register_all(); >>> - >>> /* slurp file content into buffer */ >>> ret = av_file_map(input_filename, &buffer, &buffer_size, 0, NULL); >>> if (ret < 0) >>> diff --git a/doc/examples/decode_audio.c b/doc/examples/decode_audio.c >>> index fb9a9af2f6..19dcafd2c8 100644 >>> --- a/doc/examples/decode_audio.c >>> +++ b/doc/examples/decode_audio.c >>> @@ -94,9 +94,6 @@ int main(int argc, char **argv) >>> filename = argv[1]; >>> outfilename = argv[2]; >>> >>> - /* register all the codecs */ >>> - avcodec_register_all(); >>> - >>> pkt = av_packet_alloc(); >>> >>> /* find the MPEG audio decoder */ >>> diff --git a/doc/examples/decode_video.c b/doc/examples/decode_video.c >>> index 4377fd49e0..5a9d43f689 100644 >>> --- a/doc/examples/decode_video.c >>> +++ b/doc/examples/decode_video.c >>> @@ -101,8 +101,6 @@ int main(int argc, char **argv) >>> filename = argv[1]; >>> outfilename = argv[2]; >>> >>> - avcodec_register_all(); >>> - >>> pkt = av_packet_alloc(); >>> if (!pkt) >>> exit(1); >>> diff --git a/doc/examples/demuxing_decoding.c b/doc/examples/demuxing_decoding.c >>> index b1a216abb4..69a31a8935 100644 >>> --- a/doc/examples/demuxing_decoding.c >>> +++ b/doc/examples/demuxing_decoding.c >>> @@ -252,9 +252,6 @@ int main (int argc, char **argv) >>> video_dst_filename = argv[2]; >>> audio_dst_filename = argv[3]; >>> >>> - /* register all formats and codecs */ >>> - av_register_all(); >>> - >>> /* open input file, and allocate format context */ >>> if (avformat_open_input(&fmt_ctx, src_filename, NULL, NULL) < 0) { >>> fprintf(stderr, "Could not open source file %s\n", src_filename); >>> diff --git a/doc/examples/encode_audio.c b/doc/examples/encode_audio.c >>> index d1ef105d9d..ab3586be7f 100644 >>> --- a/doc/examples/encode_audio.c >>> +++ b/doc/examples/encode_audio.c >>> @@ -138,9 +138,6 @@ int main(int argc, char **argv) >>> } >>> filename = argv[1]; >>> >>> - /* register all the codecs */ >>> - avcodec_register_all(); >>> - >>> /* find the MP2 encoder */ >>> codec = avcodec_find_encoder(AV_CODEC_ID_MP2); >>> if (!codec) { >>> diff --git a/doc/examples/encode_video.c b/doc/examples/encode_video.c >>> index 8cd13219bb..6731b2ad19 100644 >>> --- a/doc/examples/encode_video.c >>> +++ b/doc/examples/encode_video.c >>> @@ -84,8 +84,6 @@ int main(int argc, char **argv) >>> filename = argv[1]; >>> codec_name = argv[2]; >>> >>> - avcodec_register_all(); >>> - >>> /* find the mpeg1video encoder */ >>> codec = avcodec_find_encoder_by_name(codec_name); >>> if (!codec) { >>> diff --git a/doc/examples/extract_mvs.c b/doc/examples/extract_mvs.c >>> index 7ae934ead3..de31ccd2b9 100644 >>> --- a/doc/examples/extract_mvs.c >>> +++ b/doc/examples/extract_mvs.c >>> @@ -129,8 +129,6 @@ int main(int argc, char **argv) >>> } >>> src_filename = argv[1]; >>> >>> - av_register_all(); >>> - >>> if (avformat_open_input(&fmt_ctx, src_filename, NULL, NULL) < 0) { >>> fprintf(stderr, "Could not open source file %s\n", src_filename); >>> exit(1); >>> diff --git a/doc/examples/filtering_audio.c b/doc/examples/filtering_audio.c >>> index 18d6ca275c..73a00e814c 100644 >>> --- a/doc/examples/filtering_audio.c >>> +++ b/doc/examples/filtering_audio.c >>> @@ -228,7 +228,6 @@ int main(int argc, char **argv) >>> exit(1); >>> } >>> >>> - av_register_all(); >>> avfilter_register_all(); >>> >>> if ((ret = open_input_file(argv[1])) < 0) >>> diff --git a/doc/examples/filtering_video.c b/doc/examples/filtering_video.c >>> index 9b607ba016..01d6644620 100644 >>> --- a/doc/examples/filtering_video.c >>> +++ b/doc/examples/filtering_video.c >>> @@ -222,7 +222,6 @@ int main(int argc, char **argv) >>> exit(1); >>> } >>> >>> - av_register_all(); >>> avfilter_register_all(); >>> >>> if ((ret = open_input_file(argv[1])) < 0) >>> diff --git a/doc/examples/http_multiclient.c b/doc/examples/http_multiclient.c >>> index e2c2201a08..831e89c60a 100644 >>> --- a/doc/examples/http_multiclient.c >>> +++ b/doc/examples/http_multiclient.c >>> @@ -114,7 +114,6 @@ int main(int argc, char **argv) >>> in_uri = argv[1]; >>> out_uri = argv[2]; >>> >>> - av_register_all(); >>> avformat_network_init(); >>> >>> if ((ret = av_dict_set(&options, "listen", "2", 0)) < 0) { >>> diff --git a/doc/examples/hw_decode.c b/doc/examples/hw_decode.c >>> index 83a5808bf7..14fe08b374 100644 >>> --- a/doc/examples/hw_decode.c >>> +++ b/doc/examples/hw_decode.c >>> @@ -163,8 +163,6 @@ int main(int argc, char *argv[]) >>> return -1; >>> } >>> >>> - av_register_all(); >>> - >>> type = av_hwdevice_find_type_by_name(argv[1]); >>> if (type == AV_HWDEVICE_TYPE_NONE) { >>> fprintf(stderr, "Device type %s is not supported.\n", argv[1]); >>> diff --git a/doc/examples/metadata.c b/doc/examples/metadata.c >>> index f73c267369..e330d077a9 100644 >>> --- a/doc/examples/metadata.c >>> +++ b/doc/examples/metadata.c >>> @@ -44,7 +44,6 @@ int main (int argc, char **argv) >>> return 1; >>> } >>> >>> - av_register_all(); >>> if ((ret = avformat_open_input(&fmt_ctx, argv[1], NULL, NULL))) >>> return ret; >>> >>> diff --git a/doc/examples/muxing.c b/doc/examples/muxing.c >>> index 6b98a3b2a0..08da98e574 100644 >>> --- a/doc/examples/muxing.c >>> +++ b/doc/examples/muxing.c >>> @@ -564,9 +564,6 @@ int main(int argc, char **argv) >>> AVDictionary *opt = NULL; >>> int i; >>> >>> - /* Initialize libavcodec, and register all codecs and formats. */ >>> - av_register_all(); >>> - >>> if (argc < 2) { >>> printf("usage: %s output_file\n" >>> "API example program to output a media file with libavformat.\n" >>> diff --git a/doc/examples/qsvdec.c b/doc/examples/qsvdec.c >>> index cede6153be..7415eefca5 100644 >>> --- a/doc/examples/qsvdec.c >>> +++ b/doc/examples/qsvdec.c >>> @@ -150,8 +150,6 @@ int main(int argc, char **argv) >>> >>> int ret, i; >>> >>> - av_register_all(); >>> - >>> if (argc < 3) { >>> fprintf(stderr, "Usage: %s <input file> <output file>\n", argv[0]); >>> return 1; >>> diff --git a/doc/examples/remuxing.c b/doc/examples/remuxing.c >>> index 59594181a7..9e4d1031b4 100644 >>> --- a/doc/examples/remuxing.c >>> +++ b/doc/examples/remuxing.c >>> @@ -65,8 +65,6 @@ int main(int argc, char **argv) >>> in_filename = argv[1]; >>> out_filename = argv[2]; >>> >>> - av_register_all(); >>> - >>> if ((ret = avformat_open_input(&ifmt_ctx, in_filename, 0, 0)) < 0) { >>> fprintf(stderr, "Could not open input file '%s'", in_filename); >>> goto end; >>> diff --git a/doc/examples/transcode_aac.c b/doc/examples/transcode_aac.c >>> index 3c7688cd33..b19349573a 100644 >>> --- a/doc/examples/transcode_aac.c >>> +++ b/doc/examples/transcode_aac.c >>> @@ -753,8 +753,6 @@ int main(int argc, char **argv) >>> exit(1); >>> } >>> >>> - /* Register all codecs and formats so that they can be used. */ >>> - av_register_all(); >>> /* Open the input file for reading. */ >>> if (open_input_file(argv[1], &input_format_context, >>> &input_codec_context)) >>> diff --git a/doc/examples/transcoding.c b/doc/examples/transcoding.c >>> index e32ab20245..ed1fd6411b 100644 >>> --- a/doc/examples/transcoding.c >>> +++ b/doc/examples/transcoding.c >>> @@ -517,7 +517,6 @@ int main(int argc, char **argv) >>> return 1; >>> } >>> >>> - av_register_all(); >>> avfilter_register_all(); >>> >>> if ((ret = open_input_file(argv[1])) < 0) >>> diff --git a/doc/examples/vaapi_encode.c b/doc/examples/vaapi_encode.c >>> index 6425b1c98c..3bdc62bef3 100644 >>> --- a/doc/examples/vaapi_encode.c >>> +++ b/doc/examples/vaapi_encode.c >>> @@ -125,8 +125,6 @@ int main(int argc, char *argv[]) >>> goto close; >>> } >>> >>> - avcodec_register_all(); >>> - >>> err = av_hwdevice_ctx_create(&hw_device_ctx, AV_HWDEVICE_TYPE_VAAPI, >>> NULL, NULL, 0); >>> if (err < 0) { >>> diff --git a/doc/examples/vaapi_transcode.c b/doc/examples/vaapi_transcode.c >>> index 6318895af3..649f48b97c 100644 >>> --- a/doc/examples/vaapi_transcode.c >>> +++ b/doc/examples/vaapi_transcode.c >>> @@ -238,8 +238,6 @@ int main(int argc, char **argv) >>> return -1; >>> } >>> >>> - av_register_all(); >>> - >>> ret = av_hwdevice_ctx_create(&hw_device_ctx, AV_HWDEVICE_TYPE_VAAPI, NULL, NULL, 0); >>> if (ret < 0) { >>> fprintf(stderr, "Failed to create a VAAPI device. Error code: %s\n", av_err2str(ret)); >> LGTM, but why don't clean the other part,e,g >> ffmpeg.c/ffplay.c/ffprobe.c/... at the same time. > > Separate patches are needed for that. One big "remove this thing from > the entire codebase" commit is never good. Makes bisecting for > regressions a pain. Yeah. This one was specifically motivated by a question in IRC which was roughly "The register functions are now deprecated but the examples still use them, what am I meant to use instead?". Applied. Thanks, - Mark
diff --git a/doc/examples/avio_dir_cmd.c b/doc/examples/avio_dir_cmd.c index 50c435cf8f..0722bd9ab1 100644 --- a/doc/examples/avio_dir_cmd.c +++ b/doc/examples/avio_dir_cmd.c @@ -143,8 +143,6 @@ int main(int argc, char *argv[]) return 1; } - /* register codecs and formats and other lavf/lavc components*/ - av_register_all(); avformat_network_init(); op = argv[1]; diff --git a/doc/examples/avio_reading.c b/doc/examples/avio_reading.c index 7860fd5e2f..cbfeb174b8 100644 --- a/doc/examples/avio_reading.c +++ b/doc/examples/avio_reading.c @@ -74,9 +74,6 @@ int main(int argc, char *argv[]) } input_filename = argv[1]; - /* register codecs and formats and other lavf/lavc components*/ - av_register_all(); - /* slurp file content into buffer */ ret = av_file_map(input_filename, &buffer, &buffer_size, 0, NULL); if (ret < 0) diff --git a/doc/examples/decode_audio.c b/doc/examples/decode_audio.c index fb9a9af2f6..19dcafd2c8 100644 --- a/doc/examples/decode_audio.c +++ b/doc/examples/decode_audio.c @@ -94,9 +94,6 @@ int main(int argc, char **argv) filename = argv[1]; outfilename = argv[2]; - /* register all the codecs */ - avcodec_register_all(); - pkt = av_packet_alloc(); /* find the MPEG audio decoder */ diff --git a/doc/examples/decode_video.c b/doc/examples/decode_video.c index 4377fd49e0..5a9d43f689 100644 --- a/doc/examples/decode_video.c +++ b/doc/examples/decode_video.c @@ -101,8 +101,6 @@ int main(int argc, char **argv) filename = argv[1]; outfilename = argv[2]; - avcodec_register_all(); - pkt = av_packet_alloc(); if (!pkt) exit(1); diff --git a/doc/examples/demuxing_decoding.c b/doc/examples/demuxing_decoding.c index b1a216abb4..69a31a8935 100644 --- a/doc/examples/demuxing_decoding.c +++ b/doc/examples/demuxing_decoding.c @@ -252,9 +252,6 @@ int main (int argc, char **argv) video_dst_filename = argv[2]; audio_dst_filename = argv[3]; - /* register all formats and codecs */ - av_register_all(); - /* open input file, and allocate format context */ if (avformat_open_input(&fmt_ctx, src_filename, NULL, NULL) < 0) { fprintf(stderr, "Could not open source file %s\n", src_filename); diff --git a/doc/examples/encode_audio.c b/doc/examples/encode_audio.c index d1ef105d9d..ab3586be7f 100644 --- a/doc/examples/encode_audio.c +++ b/doc/examples/encode_audio.c @@ -138,9 +138,6 @@ int main(int argc, char **argv) } filename = argv[1]; - /* register all the codecs */ - avcodec_register_all(); - /* find the MP2 encoder */ codec = avcodec_find_encoder(AV_CODEC_ID_MP2); if (!codec) { diff --git a/doc/examples/encode_video.c b/doc/examples/encode_video.c index 8cd13219bb..6731b2ad19 100644 --- a/doc/examples/encode_video.c +++ b/doc/examples/encode_video.c @@ -84,8 +84,6 @@ int main(int argc, char **argv) filename = argv[1]; codec_name = argv[2]; - avcodec_register_all(); - /* find the mpeg1video encoder */ codec = avcodec_find_encoder_by_name(codec_name); if (!codec) { diff --git a/doc/examples/extract_mvs.c b/doc/examples/extract_mvs.c index 7ae934ead3..de31ccd2b9 100644 --- a/doc/examples/extract_mvs.c +++ b/doc/examples/extract_mvs.c @@ -129,8 +129,6 @@ int main(int argc, char **argv) } src_filename = argv[1]; - av_register_all(); - if (avformat_open_input(&fmt_ctx, src_filename, NULL, NULL) < 0) { fprintf(stderr, "Could not open source file %s\n", src_filename); exit(1); diff --git a/doc/examples/filtering_audio.c b/doc/examples/filtering_audio.c index 18d6ca275c..73a00e814c 100644 --- a/doc/examples/filtering_audio.c +++ b/doc/examples/filtering_audio.c @@ -228,7 +228,6 @@ int main(int argc, char **argv) exit(1); } - av_register_all(); avfilter_register_all(); if ((ret = open_input_file(argv[1])) < 0) diff --git a/doc/examples/filtering_video.c b/doc/examples/filtering_video.c index 9b607ba016..01d6644620 100644 --- a/doc/examples/filtering_video.c +++ b/doc/examples/filtering_video.c @@ -222,7 +222,6 @@ int main(int argc, char **argv) exit(1); } - av_register_all(); avfilter_register_all(); if ((ret = open_input_file(argv[1])) < 0) diff --git a/doc/examples/http_multiclient.c b/doc/examples/http_multiclient.c index e2c2201a08..831e89c60a 100644 --- a/doc/examples/http_multiclient.c +++ b/doc/examples/http_multiclient.c @@ -114,7 +114,6 @@ int main(int argc, char **argv) in_uri = argv[1]; out_uri = argv[2]; - av_register_all(); avformat_network_init(); if ((ret = av_dict_set(&options, "listen", "2", 0)) < 0) { diff --git a/doc/examples/hw_decode.c b/doc/examples/hw_decode.c index 83a5808bf7..14fe08b374 100644 --- a/doc/examples/hw_decode.c +++ b/doc/examples/hw_decode.c @@ -163,8 +163,6 @@ int main(int argc, char *argv[]) return -1; } - av_register_all(); - type = av_hwdevice_find_type_by_name(argv[1]); if (type == AV_HWDEVICE_TYPE_NONE) { fprintf(stderr, "Device type %s is not supported.\n", argv[1]); diff --git a/doc/examples/metadata.c b/doc/examples/metadata.c index f73c267369..e330d077a9 100644 --- a/doc/examples/metadata.c +++ b/doc/examples/metadata.c @@ -44,7 +44,6 @@ int main (int argc, char **argv) return 1; } - av_register_all(); if ((ret = avformat_open_input(&fmt_ctx, argv[1], NULL, NULL))) return ret; diff --git a/doc/examples/muxing.c b/doc/examples/muxing.c index 6b98a3b2a0..08da98e574 100644 --- a/doc/examples/muxing.c +++ b/doc/examples/muxing.c @@ -564,9 +564,6 @@ int main(int argc, char **argv) AVDictionary *opt = NULL; int i; - /* Initialize libavcodec, and register all codecs and formats. */ - av_register_all(); - if (argc < 2) { printf("usage: %s output_file\n" "API example program to output a media file with libavformat.\n" diff --git a/doc/examples/qsvdec.c b/doc/examples/qsvdec.c index cede6153be..7415eefca5 100644 --- a/doc/examples/qsvdec.c +++ b/doc/examples/qsvdec.c @@ -150,8 +150,6 @@ int main(int argc, char **argv) int ret, i; - av_register_all(); - if (argc < 3) { fprintf(stderr, "Usage: %s <input file> <output file>\n", argv[0]); return 1; diff --git a/doc/examples/remuxing.c b/doc/examples/remuxing.c index 59594181a7..9e4d1031b4 100644 --- a/doc/examples/remuxing.c +++ b/doc/examples/remuxing.c @@ -65,8 +65,6 @@ int main(int argc, char **argv) in_filename = argv[1]; out_filename = argv[2]; - av_register_all(); - if ((ret = avformat_open_input(&ifmt_ctx, in_filename, 0, 0)) < 0) { fprintf(stderr, "Could not open input file '%s'", in_filename); goto end; diff --git a/doc/examples/transcode_aac.c b/doc/examples/transcode_aac.c index 3c7688cd33..b19349573a 100644 --- a/doc/examples/transcode_aac.c +++ b/doc/examples/transcode_aac.c @@ -753,8 +753,6 @@ int main(int argc, char **argv) exit(1); } - /* Register all codecs and formats so that they can be used. */ - av_register_all(); /* Open the input file for reading. */ if (open_input_file(argv[1], &input_format_context, &input_codec_context)) diff --git a/doc/examples/transcoding.c b/doc/examples/transcoding.c index e32ab20245..ed1fd6411b 100644 --- a/doc/examples/transcoding.c +++ b/doc/examples/transcoding.c @@ -517,7 +517,6 @@ int main(int argc, char **argv) return 1; } - av_register_all(); avfilter_register_all(); if ((ret = open_input_file(argv[1])) < 0) diff --git a/doc/examples/vaapi_encode.c b/doc/examples/vaapi_encode.c index 6425b1c98c..3bdc62bef3 100644 --- a/doc/examples/vaapi_encode.c +++ b/doc/examples/vaapi_encode.c @@ -125,8 +125,6 @@ int main(int argc, char *argv[]) goto close; } - avcodec_register_all(); - err = av_hwdevice_ctx_create(&hw_device_ctx, AV_HWDEVICE_TYPE_VAAPI, NULL, NULL, 0); if (err < 0) { diff --git a/doc/examples/vaapi_transcode.c b/doc/examples/vaapi_transcode.c index 6318895af3..649f48b97c 100644 --- a/doc/examples/vaapi_transcode.c +++ b/doc/examples/vaapi_transcode.c @@ -238,8 +238,6 @@ int main(int argc, char **argv) return -1; } - av_register_all(); - ret = av_hwdevice_ctx_create(&hw_device_ctx, AV_HWDEVICE_TYPE_VAAPI, NULL, NULL, 0); if (ret < 0) { fprintf(stderr, "Failed to create a VAAPI device. Error code: %s\n", av_err2str(ret));