diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-08-04 01:40:29 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-08-04 01:40:29 +0200 |
commit | 64160ef39216b2d40eb34c13421febe045ddcf8a (patch) | |
tree | f5d63c19adb037a18baf2689f503f165b9c39aaf /libavcodec/cljr.c | |
parent | 72b0c9f55f26049e22bf147ab120173bd1d54cd5 (diff) | |
parent | fed6c90b68fa00ad399e0b6d51c1e41d0d3730a0 (diff) | |
download | ffmpeg-streaming-64160ef39216b2d40eb34c13421febe045ddcf8a.zip ffmpeg-streaming-64160ef39216b2d40eb34c13421febe045ddcf8a.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
cosmetics: remove some stray comments from AVCodec declarations
cosmetics: fix indentation/alignment in AVCodec declarations
arm: Avoid using the movw instruction needlessly
Move an int64_t down in MpegEncContext
Conflicts:
libavcodec/arm/ac3dsp_armv6.S
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/cljr.c')
-rw-r--r-- | libavcodec/cljr.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/cljr.c b/libavcodec/cljr.c index ed02c27..2e7fd51 100644 --- a/libavcodec/cljr.c +++ b/libavcodec/cljr.c @@ -160,7 +160,6 @@ AVCodec ff_cljr_encoder = { .priv_data_size = sizeof(CLJRContext), .init = encode_init, .encode = encode_frame, - //encode_end, .long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"), }; #endif |