diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-06 22:52:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-06 22:52:01 +0200 |
| commit | 2e0c360abd74b94991aa9a271cadc72aae1471c2 (patch) | |
| tree | cbea40b59f334f8f7447a79b6fbdf514f0dd2e0c /libavformat/a64.c | |
| parent | bd128e9bff8aaec97ce7dcd414717c214536c7d9 (diff) | |
| parent | 20234a4bd7e187ae31f9a66b5c40e98666bc30e4 (diff) | |
| download | ffmpeg-2e0c360abd74b94991aa9a271cadc72aae1471c2.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
cosmetics: Align muxer/demuxer declarations
mpeg12: Do not change frame_pred_frame_dct flag and demote error into a warning
avcodec: remove avcodec_guess_channel_layout()
avutil: Add av_get_default_channel_layout()
Conflicts:
doc/APIchanges
libavcodec/mpeg12.c
libavformat/cdg.c
libavformat/matroskaenc.c
libavformat/mpegts.c
libavformat/nuv.c
libavformat/wav.c
libavutil/audioconvert.c
libavutil/audioconvert.h
libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/a64.c')
| -rw-r--r-- | libavformat/a64.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavformat/a64.c b/libavformat/a64.c index 4c8a942471..2cd24083a8 100644 --- a/libavformat/a64.c +++ b/libavformat/a64.c @@ -164,12 +164,12 @@ static int a64_write_trailer(struct AVFormatContext *s) } AVOutputFormat ff_a64_muxer = { - .name = "a64", - .long_name = NULL_IF_CONFIG_SMALL("a64 - video for Commodore 64"), - .extensions = "a64, A64", + .name = "a64", + .long_name = NULL_IF_CONFIG_SMALL("a64 - video for Commodore 64"), + .extensions = "a64, A64", .priv_data_size = sizeof (A64Context), - .video_codec = CODEC_ID_A64_MULTI, - .write_header = a64_write_header, - .write_packet = a64_write_packet, - .write_trailer = a64_write_trailer + .video_codec = CODEC_ID_A64_MULTI, + .write_header = a64_write_header, + .write_packet = a64_write_packet, + .write_trailer = a64_write_trailer, }; |