diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-31 22:41:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-31 22:41:00 +0200 |
| commit | d1dad7c824c14939a0e18fa262f3e51957de6e3e (patch) | |
| tree | 615f6ba80611f53e520d2ae479d9d4409077a78d /libavformat/mpegenc.c | |
| parent | d2ca5dd0f33b0fdbb5d2a7429c8f71ff1dffffb7 (diff) | |
| parent | f2ed006c90ccb65cd143d8b0fcfc28ffb98c4289 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpc8: return more meaningful error codes.
mpc: return more meaningful error codes.
wv,mpc8: don't return apetag data in packets.
rtmp: do not warn about receiving metadata packets
x86: h264dsp: Adjust YASM #ifdefs
x86: yadif: Mark mmxext optimizations as such
h264: convert loop filter strength dsp function to yasm.
Improve descriptiveness of a number of codec and container long names
Conflicts:
libavcodec/flvdec.c
libavcodec/libopenjpegdec.c
libavformat/apetag.c
libavformat/mp3dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mpegenc.c')
| -rw-r--r-- | libavformat/mpegenc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c index cf92631433..c9f1e8e03e 100644 --- a/libavformat/mpegenc.c +++ b/libavformat/mpegenc.c @@ -1147,7 +1147,7 @@ static const AVClass flavor ## _class = {\ MPEGENC_CLASS(mpeg) AVOutputFormat ff_mpeg1system_muxer = { .name = "mpeg", - .long_name = NULL_IF_CONFIG_SMALL("MPEG-1 System format"), + .long_name = NULL_IF_CONFIG_SMALL("MPEG-1 Systems / MPEG program stream"), .mime_type = "video/mpeg", .extensions = "mpg,mpeg", .priv_data_size = sizeof(MpegMuxContext), @@ -1163,7 +1163,7 @@ AVOutputFormat ff_mpeg1system_muxer = { MPEGENC_CLASS(vcd) AVOutputFormat ff_mpeg1vcd_muxer = { .name = "vcd", - .long_name = NULL_IF_CONFIG_SMALL("MPEG-1 System format (VCD)"), + .long_name = NULL_IF_CONFIG_SMALL("MPEG-1 Systems / MPEG program stream (VCD)"), .mime_type = "video/mpeg", .priv_data_size = sizeof(MpegMuxContext), .audio_codec = CODEC_ID_MP2, @@ -1196,7 +1196,7 @@ AVOutputFormat ff_mpeg2vob_muxer = { MPEGENC_CLASS(svcd) AVOutputFormat ff_mpeg2svcd_muxer = { .name = "svcd", - .long_name = NULL_IF_CONFIG_SMALL("MPEG-2 PS format (VOB)"), + .long_name = NULL_IF_CONFIG_SMALL("MPEG-2 PS (SVCD)"), .mime_type = "video/mpeg", .extensions = "vob", .priv_data_size = sizeof(MpegMuxContext), |