diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-30 23:04:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-30 23:28:31 +0200 |
| commit | b5da7d4c1a7f08f89aece651a8f0f8c4963e5ad9 (patch) | |
| tree | c5ade4afd26c2cbd5fd7d5442e044e688724269a /libavformat/mpegenc.c | |
| parent | a85b4a5696787e36df8d7c805de8f86ea6365acb (diff) | |
| parent | 6774247a9d7d15033c2b80118c03cb0cb10027df (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avformat: Drop pointless "format" from container long names
swscale: bury one more piece of inline asm under HAVE_INLINE_ASM.
wv: K&R formatting cosmetics
configure: Add missing descriptions to help output
h264_ps: declare array of colorspace strings on its own line.
fate: amix: specify f32 sample format for comparison
tiny_psnr: support 32-bit float samples
eamad/eatgq/eatqi: call special EA IDCT directly
eamad: remove use of MpegEncContext
mpegvideo: remove unnecessary inclusions of faandct.h
af_asyncts: avoid overflow in out_size with large delta values
af_asyncts: add first_pts option
Conflicts:
configure
libavcodec/eamad.c
libavcodec/h264_ps.c
libavformat/crcenc.c
libavformat/ffmdec.c
libavformat/ffmenc.c
libavformat/framecrcenc.c
libavformat/md5enc.c
libavformat/nutdec.c
libavformat/rawenc.c
libavformat/yuv4mpeg.c
tests/tiny_psnr.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mpegenc.c')
| -rw-r--r-- | libavformat/mpegenc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c index d07a0471bf..cf92631433 100644 --- a/libavformat/mpegenc.c +++ b/libavformat/mpegenc.c @@ -1178,7 +1178,7 @@ AVOutputFormat ff_mpeg1vcd_muxer = { MPEGENC_CLASS(vob) AVOutputFormat ff_mpeg2vob_muxer = { .name = "vob", - .long_name = NULL_IF_CONFIG_SMALL("MPEG-2 PS format (VOB)"), + .long_name = NULL_IF_CONFIG_SMALL("MPEG-2 PS (VOB)"), .mime_type = "video/mpeg", .extensions = "vob", .priv_data_size = sizeof(MpegMuxContext), @@ -1214,7 +1214,7 @@ AVOutputFormat ff_mpeg2svcd_muxer = { MPEGENC_CLASS(dvd) AVOutputFormat ff_mpeg2dvd_muxer = { .name = "dvd", - .long_name = NULL_IF_CONFIG_SMALL("MPEG-2 PS format (DVD VOB)"), + .long_name = NULL_IF_CONFIG_SMALL("MPEG-2 PS (DVD VOB)"), .mime_type = "video/mpeg", .extensions = "dvd", .priv_data_size = sizeof(MpegMuxContext), |