Some callers assume that item_name is always set, so this may be considered an API break. This reverts commit 0c6203c97a99f69dbaa6e4011d48c331e1111f5e.
Showing the changes to libavdevice (33 of 363 files). Show all
Unified · Split
| @@ -151,6 +151,7 @@ static const AVOption options[] = { · 150 unmodified lines | ||
| 151 | 151 | |
| 152 | 152 | static const AVClass alsa_demuxer_class = { |
| 153 | 153 | .class_name = "ALSA indev", |
| 154 | + .item_name = av_default_item_name, | |
| 154 | 155 | .option = options, |
| 155 | 156 | .version = LIBAVUTIL_VERSION_INT, |
| 156 | 157 | .category = AV_CLASS_CATEGORY_DEVICE_AUDIO_INPUT, |
| @@ -161,6 +161,7 @@ static int audio_get_device_list(AVFormatContext *h, AVDeviceInfoList *device_li · 160 unmodified lines | ||
| 161 | 161 | |
| 162 | 162 | static const AVClass alsa_muxer_class = { |
| 163 | 163 | .class_name = "ALSA outdev", |
| 164 | + .item_name = av_default_item_name, | |
| 164 | 165 | .version = LIBAVUTIL_VERSION_INT, |
| 165 | 166 | .category = AV_CLASS_CATEGORY_DEVICE_AUDIO_OUTPUT, |
| 166 | 167 | }; |
| @@ -854,6 +854,7 @@ static const AVOption options[] = { · 853 unmodified lines | ||
| 854 | 854 | |
| 855 | 855 | static const AVClass android_camera_class = { |
| 856 | 856 | .class_name = "android_camera indev", |
| 857 | + .item_name = av_default_item_name, | |
| 857 | 858 | .option = options, |
| 858 | 859 | .version = LIBAVUTIL_VERSION_INT, |
| 859 | 860 | .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT, |
| @@ -293,6 +293,7 @@ static const AVOption options[] = { · 292 unmodified lines | ||
| 293 | 293 | |
| 294 | 294 | static const AVClass at_class = { |
| 295 | 295 | .class_name = "AudioToolbox", |
| 296 | + .item_name = av_default_item_name, | |
| 296 | 297 | .option = options, |
| 297 | 298 | .version = LIBAVUTIL_VERSION_INT, |
| 298 | 299 | .category = AV_CLASS_CATEGORY_DEVICE_AUDIO_OUTPUT, |
| @@ -1286,6 +1286,7 @@ static const AVOption options[] = { · 1285 unmodified lines | ||
| 1286 | 1286 | |
| 1287 | 1287 | static const AVClass avf_class = { |
| 1288 | 1288 | .class_name = "AVFoundation indev", |
| 1289 | + .item_name = av_default_item_name, | |
| 1289 | 1290 | .option = options, |
| 1290 | 1291 | .version = LIBAVUTIL_VERSION_INT, |
| 1291 | 1292 | .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT, |
| @@ -343,6 +343,7 @@ static const AVOption options[] = { · 342 unmodified lines | ||
| 343 | 343 | |
| 344 | 344 | static const AVClass bktr_class = { |
| 345 | 345 | .class_name = "BKTR grab indev", |
| 346 | + .item_name = av_default_item_name, | |
| 346 | 347 | .option = options, |
| 347 | 348 | .version = LIBAVUTIL_VERSION_INT, |
| 348 | 349 | .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT, |
| @@ -215,6 +215,7 @@ static const AVOption options[] = { · 214 unmodified lines | ||
| 215 | 215 | |
| 216 | 216 | static const AVClass caca_class = { |
| 217 | 217 | .class_name = "caca outdev", |
| 218 | + .item_name = av_default_item_name, | |
| 218 | 219 | .option = options, |
| 219 | 220 | .version = LIBAVUTIL_VERSION_INT, |
| 220 | 221 | .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_OUTPUT, |
| @@ -105,6 +105,7 @@ static const AVOption options[] = { · 104 unmodified lines | ||
| 105 | 105 | |
| 106 | 106 | static const AVClass decklink_demuxer_class = { |
| 107 | 107 | .class_name = "Blackmagic DeckLink indev", |
| 108 | + .item_name = av_default_item_name, | |
| 108 | 109 | .option = options, |
| 109 | 110 | .version = LIBAVUTIL_VERSION_INT, |
| 110 | 111 | .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT, |
| @@ -67,6 +67,7 @@ static const AVOption options[] = { · 66 unmodified lines | ||
| 67 | 67 | |
| 68 | 68 | static const AVClass decklink_muxer_class = { |
| 69 | 69 | .class_name = "Blackmagic DeckLink outdev", |
| 70 | + .item_name = av_default_item_name, | |
| 70 | 71 | .option = options, |
| 71 | 72 | .version = LIBAVUTIL_VERSION_INT, |
| 72 | 73 | .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_OUTPUT, |
| @@ -1918,6 +1918,7 @@ static const AVOption options[] = { · 1917 unmodified lines | ||
| 1918 | 1918 | |
| 1919 | 1919 | static const AVClass dshow_class = { |
| 1920 | 1920 | .class_name = "dshow indev", |
| 1921 | + .item_name = av_default_item_name, | |
| 1921 | 1922 | .option = options, |
| 1922 | 1923 | .version = LIBAVUTIL_VERSION_INT, |
| 1923 | 1924 | .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT, |
| @@ -226,6 +226,7 @@ static const AVOption options[] = { · 225 unmodified lines | ||
| 226 | 226 | |
| 227 | 227 | static const AVClass fbdev_class = { |
| 228 | 228 | .class_name = "fbdev indev", |
| 229 | + .item_name = av_default_item_name, | |
| 229 | 230 | .option = options, |
| 230 | 231 | .version = LIBAVUTIL_VERSION_INT, |
| 231 | 232 | .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT, |
| @@ -201,6 +201,7 @@ static const AVOption options[] = { · 200 unmodified lines | ||
| 201 | 201 | |
| 202 | 202 | static const AVClass fbdev_class = { |
| 203 | 203 | .class_name = "fbdev outdev", |
| 204 | + .item_name = av_default_item_name, | |
| 204 | 205 | .option = options, |
| 205 | 206 | .version = LIBAVUTIL_VERSION_INT, |
| 206 | 207 | .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_OUTPUT, |
| @@ -670,6 +670,7 @@ static const AVOption options[] = { · 669 unmodified lines | ||
| 670 | 670 | |
| 671 | 671 | static const AVClass gdigrab_class = { |
| 672 | 672 | .class_name = "GDIgrab indev", |
| 673 | + .item_name = av_default_item_name, | |
| 673 | 674 | .option = options, |
| 674 | 675 | .version = LIBAVUTIL_VERSION_INT, |
| 675 | 676 | .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT, |
| @@ -496,6 +496,7 @@ static const AVOption options[] = { · 495 unmodified lines | ||
| 496 | 496 | |
| 497 | 497 | static const AVClass iec61883_class = { |
| 498 | 498 | .class_name = "iec61883 indev", |
| 499 | + .item_name = av_default_item_name, | |
| 499 | 500 | .option = options, |
| 500 | 501 | .version = LIBAVUTIL_VERSION_INT, |
| 501 | 502 | .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT, |
| @@ -335,6 +335,7 @@ static const AVOption options[] = { · 334 unmodified lines | ||
| 335 | 335 | |
| 336 | 336 | static const AVClass jack_indev_class = { |
| 337 | 337 | .class_name = "JACK indev", |
| 338 | + .item_name = av_default_item_name, | |
| 338 | 339 | .option = options, |
| 339 | 340 | .version = LIBAVUTIL_VERSION_INT, |
| 340 | 341 | .category = AV_CLASS_CATEGORY_DEVICE_AUDIO_INPUT, |
| @@ -702,6 +702,7 @@ static const AVOption options[] = { · 701 unmodified lines | ||
| 702 | 702 | |
| 703 | 703 | static const AVClass kmsgrab_class = { |
| 704 | 704 | .class_name = "kmsgrab indev", |
| 705 | + .item_name = av_default_item_name, | |
| 705 | 706 | .option = options, |
| 706 | 707 | .version = LIBAVUTIL_VERSION_INT, |
| 707 | 708 | .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT, |
| @@ -487,6 +487,7 @@ static const AVOption options[] = { · 486 unmodified lines | ||
| 487 | 487 | |
| 488 | 488 | static const AVClass lavfi_class = { |
| 489 | 489 | .class_name = "lavfi indev", |
| 490 | + .item_name = av_default_item_name, | |
| 490 | 491 | .option = options, |
| 491 | 492 | .version = LIBAVUTIL_VERSION_INT, |
| 492 | 493 | .category = AV_CLASS_CATEGORY_DEVICE_INPUT, |
| @@ -174,6 +174,7 @@ static const AVOption options[] = { · 173 unmodified lines | ||
| 174 | 174 | |
| 175 | 175 | static const AVClass libcdio_class = { |
| 176 | 176 | .class_name = "libcdio indev", |
| 177 | + .item_name = av_default_item_name, | |
| 177 | 178 | .option = options, |
| 178 | 179 | .version = LIBAVUTIL_VERSION_INT, |
| 179 | 180 | .category = AV_CLASS_CATEGORY_DEVICE_AUDIO_INPUT, |
| @@ -87,6 +87,7 @@ static const AVOption options[] = { · 86 unmodified lines | ||
| 87 | 87 | |
| 88 | 88 | static const AVClass libdc1394_class = { |
| 89 | 89 | .class_name = "libdc1394 indev", |
| 90 | + .item_name = av_default_item_name, | |
| 90 | 91 | .option = options, |
| 91 | 92 | .version = LIBAVUTIL_VERSION_INT, |
| 92 | 93 | .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT, |
| @@ -242,6 +242,7 @@ static const AVOption options[] = { · 241 unmodified lines | ||
| 242 | 242 | |
| 243 | 243 | static const AVClass class = { |
| 244 | 244 | .class_name = "openal indev", |
| 245 | + .item_name = av_default_item_name, | |
| 245 | 246 | .option = options, |
| 246 | 247 | .version = LIBAVUTIL_VERSION_INT, |
| 247 | 248 | .category = AV_CLASS_CATEGORY_DEVICE_AUDIO_INPUT, |
| @@ -1291,6 +1291,7 @@ static const AVOption options[] = { · 1290 unmodified lines | ||
| 1291 | 1291 | |
| 1292 | 1292 | static const AVClass opengl_class = { |
| 1293 | 1293 | .class_name = "opengl outdev", |
| 1294 | + .item_name = av_default_item_name, | |
| 1294 | 1295 | .option = options, |
| 1295 | 1296 | .version = LIBAVUTIL_VERSION_INT, |
| 1296 | 1297 | .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_OUTPUT, |
| @@ -124,6 +124,7 @@ static const AVOption options[] = { · 123 unmodified lines | ||
| 124 | 124 | |
| 125 | 125 | static const AVClass oss_demuxer_class = { |
| 126 | 126 | .class_name = "OSS indev", |
| 127 | + .item_name = av_default_item_name, | |
| 127 | 128 | .option = options, |
| 128 | 129 | .version = LIBAVUTIL_VERSION_INT, |
| 129 | 130 | .category = AV_CLASS_CATEGORY_DEVICE_AUDIO_INPUT, |
| @@ -90,6 +90,7 @@ static int audio_write_trailer(AVFormatContext *s1) · 89 unmodified lines | ||
| 90 | 90 | |
| 91 | 91 | static const AVClass oss_muxer_class = { |
| 92 | 92 | .class_name = "OSS outdev", |
| 93 | + .item_name = av_default_item_name, | |
| 93 | 94 | .version = LIBAVUTIL_VERSION_INT, |
| 94 | 95 | .category = AV_CLASS_CATEGORY_DEVICE_AUDIO_OUTPUT, |
| 95 | 96 | }; |
| @@ -387,6 +387,7 @@ static const AVOption options[] = { · 386 unmodified lines | ||
| 387 | 387 | |
| 388 | 388 | static const AVClass pulse_demuxer_class = { |
| 389 | 389 | .class_name = "Pulse indev", |
| 390 | + .item_name = av_default_item_name, | |
| 390 | 391 | .option = options, |
| 391 | 392 | .version = LIBAVUTIL_VERSION_INT, |
| 392 | 393 | .category = AV_CLASS_CATEGORY_DEVICE_AUDIO_INPUT, |
| @@ -783,6 +783,7 @@ static const AVOption options[] = { · 782 unmodified lines | ||
| 783 | 783 | |
| 784 | 784 | static const AVClass pulse_muxer_class = { |
| 785 | 785 | .class_name = "PulseAudio outdev", |
| 786 | + .item_name = av_default_item_name, | |
| 786 | 787 | .option = options, |
| 787 | 788 | .version = LIBAVUTIL_VERSION_INT, |
| 788 | 789 | .category = AV_CLASS_CATEGORY_DEVICE_AUDIO_OUTPUT, |
| @@ -350,6 +350,7 @@ static const AVOption options[] = { · 349 unmodified lines | ||
| 350 | 350 | |
| 351 | 351 | static const AVClass sdl2_class = { |
| 352 | 352 | .class_name = "sdl2 outdev", |
| 353 | + .item_name = av_default_item_name, | |
| 353 | 354 | .option = options, |
| 354 | 355 | .version = LIBAVUTIL_VERSION_INT, |
| 355 | 356 | .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_OUTPUT, |
| @@ -103,6 +103,7 @@ static const AVOption options[] = { · 102 unmodified lines | ||
| 103 | 103 | |
| 104 | 104 | static const AVClass sndio_demuxer_class = { |
| 105 | 105 | .class_name = "sndio indev", |
| 106 | + .item_name = av_default_item_name, | |
| 106 | 107 | .option = options, |
| 107 | 108 | .version = LIBAVUTIL_VERSION_INT, |
| 108 | 109 | .category = AV_CLASS_CATEGORY_DEVICE_AUDIO_INPUT, |
| @@ -82,6 +82,7 @@ static int audio_write_trailer(AVFormatContext *s1) · 81 unmodified lines | ||
| 82 | 82 | |
| 83 | 83 | static const AVClass sndio_muxer_class = { |
| 84 | 84 | .class_name = "sndio outdev", |
| 85 | + .item_name = av_default_item_name, | |
| 85 | 86 | .version = LIBAVUTIL_VERSION_INT, |
| 86 | 87 | .category = AV_CLASS_CATEGORY_DEVICE_AUDIO_OUTPUT, |
| 87 | 88 | }; |
| @@ -1128,6 +1128,7 @@ static const AVOption options[] = { · 1127 unmodified lines | ||
| 1128 | 1128 | |
| 1129 | 1129 | static const AVClass v4l2_class = { |
| 1130 | 1130 | .class_name = "V4L2 indev", |
| 1131 | + .item_name = av_default_item_name, | |
| 1131 | 1132 | .option = options, |
| 1132 | 1133 | .version = LIBAVUTIL_VERSION_INT, |
| 1133 | 1134 | .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT, |
| @@ -107,6 +107,7 @@ static int write_trailer(AVFormatContext *s1) · 106 unmodified lines | ||
| 107 | 107 | |
| 108 | 108 | static const AVClass v4l2_class = { |
| 109 | 109 | .class_name = "V4L2 outdev", |
| 110 | + .item_name = av_default_item_name, | |
| 110 | 111 | .version = LIBAVUTIL_VERSION_INT, |
| 111 | 112 | .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_OUTPUT, |
| 112 | 113 | }; |
| @@ -476,6 +476,7 @@ static const AVOption options[] = { · 475 unmodified lines | ||
| 476 | 476 | |
| 477 | 477 | static const AVClass vfw_class = { |
| 478 | 478 | .class_name = "VFW indev", |
| 479 | + .item_name = av_default_item_name, | |
| 479 | 480 | .option = options, |
| 480 | 481 | .version = LIBAVUTIL_VERSION_INT, |
| 481 | 482 | .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT |
| @@ -102,6 +102,7 @@ static const AVOption options[] = { · 101 unmodified lines | ||
| 102 | 102 | |
| 103 | 103 | static const AVClass xcbgrab_class = { |
| 104 | 104 | .class_name = "xcbgrab indev", |
| 105 | + .item_name = av_default_item_name, | |
| 105 | 106 | .option = options, |
| 106 | 107 | .version = LIBAVUTIL_VERSION_INT, |
| 107 | 108 | .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT, |
| @@ -371,6 +371,7 @@ static const AVOption options[] = { · 370 unmodified lines | ||
| 371 | 371 | |
| 372 | 372 | static const AVClass xv_class = { |
| 373 | 373 | .class_name = "xvideo outdev", |
| 374 | + .item_name = av_default_item_name, | |
| 374 | 375 | .option = options, |
| 375 | 376 | .version = LIBAVUTIL_VERSION_INT, |
| 376 | 377 | .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_OUTPUT, |