This allows a more efficient use of the commandline.tags/n0.8
| @@ -45,8 +45,8 @@ For more information about SDL, check: | |||||
| @table @option | @table @option | ||||
| @item window_title | @item window_title | ||||
| Set the SDL window title, if not specified default to "SDL video | |||||
| outdev". | |||||
| Set the SDL window title, if not specified default to the filename | |||||
| specified for the output device. | |||||
| @item icon_title | @item icon_title | ||||
| Set the name of the iconified SDL window, if not specified it is set | Set the name of the iconified SDL window, if not specified it is set | ||||
| @@ -63,12 +63,9 @@ If not specified it defaults to the size of the input video. | |||||
| The following command shows the @file{ffmpeg} output is an | The following command shows the @file{ffmpeg} output is an | ||||
| SDL window, forcing its size to the qcif format: | SDL window, forcing its size to the qcif format: | ||||
| @example | @example | ||||
| ffmpeg -i INPUT -vcodec rawvideo -pix_fmt yuv420p -window_size qcif -f sdl none | |||||
| ffmpeg -i INPUT -vcodec rawvideo -pix_fmt yuv420p -window_size qcif -f sdl "SDL output" | |||||
| @end example | @end example | ||||
| Note that the name specified for the output device is ignored, so it | |||||
| can be set to an arbitrary value ("none" in the above example). | |||||
| @section sndio | @section sndio | ||||
| sndio audio output device. | sndio audio output device. | ||||
| @@ -24,7 +24,7 @@ | |||||
| #define LIBAVDEVICE_VERSION_MAJOR 53 | #define LIBAVDEVICE_VERSION_MAJOR 53 | ||||
| #define LIBAVDEVICE_VERSION_MINOR 1 | #define LIBAVDEVICE_VERSION_MINOR 1 | ||||
| #define LIBAVDEVICE_VERSION_MICRO 0 | |||||
| #define LIBAVDEVICE_VERSION_MICRO 1 | |||||
| #define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \ | #define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \ | ||||
| LIBAVDEVICE_VERSION_MINOR, \ | LIBAVDEVICE_VERSION_MINOR, \ | ||||
| @@ -78,6 +78,8 @@ static int sdl_write_header(AVFormatContext *s) | |||||
| float sar, dar; /* sample and display aspect ratios */ | float sar, dar; /* sample and display aspect ratios */ | ||||
| int i, ret; | int i, ret; | ||||
| if (!sdl->window_title) | |||||
| sdl->window_title = av_strdup(s->filename); | |||||
| if (!sdl->icon_title) | if (!sdl->icon_title) | ||||
| sdl->icon_title = av_strdup(sdl->window_title); | sdl->icon_title = av_strdup(sdl->window_title); | ||||
| @@ -201,7 +203,7 @@ static int sdl_write_packet(AVFormatContext *s, AVPacket *pkt) | |||||
| #define OFFSET(x) offsetof(SDLContext,x) | #define OFFSET(x) offsetof(SDLContext,x) | ||||
| static const AVOption options[] = { | static const AVOption options[] = { | ||||
| { "window_title", "SDL window title", OFFSET(window_title), FF_OPT_TYPE_STRING, {.str = "SDL video outdev" }, 0, 0, AV_OPT_FLAG_ENCODING_PARAM }, | |||||
| { "window_title", "SDL window title", OFFSET(window_title), FF_OPT_TYPE_STRING, {.str = NULL }, 0, 0, AV_OPT_FLAG_ENCODING_PARAM }, | |||||
| { "icon_title", "SDL iconified window title", OFFSET(icon_title) , FF_OPT_TYPE_STRING, {.str = NULL }, 0, 0, AV_OPT_FLAG_ENCODING_PARAM }, | { "icon_title", "SDL iconified window title", OFFSET(icon_title) , FF_OPT_TYPE_STRING, {.str = NULL }, 0, 0, AV_OPT_FLAG_ENCODING_PARAM }, | ||||
| { "window_size", "SDL window forced size", OFFSET(window_size) , FF_OPT_TYPE_STRING, {.str = NULL }, 0, 0, AV_OPT_FLAG_ENCODING_PARAM }, | { "window_size", "SDL window forced size", OFFSET(window_size) , FF_OPT_TYPE_STRING, {.str = NULL }, 0, 0, AV_OPT_FLAG_ENCODING_PARAM }, | ||||
| { NULL }, | { NULL }, | ||||