aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* examples/decoding_encoding: remove unused variable "size"Stefano Sabatini2012-04-131-1/+1
| | | | | | | Remove unused variable size from video_encode_example() function. Fix GCC warning: decoding_encoding.c:214:22: warning: unused variable ‘size’ [-Wunused-variable]
* lavfi: install asrc_abuffer.h headerStefano Sabatini2012-04-133-3/+6
| | | | | The header is part of the public API, in particular is used by doc/examples/filtering_audio.c.
* vorbisdec: use correct channels variable.Reimar Döffinger2012-04-121-1/+1
| | | | | | | All code should use the local variable, the AVCodecContext might not yet have the updated value. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* latmenc: validate extradata size.Reimar Döffinger2012-04-121-2/+8
| | | | | | | | | Fixes potential out-of-bounds writes. This is mostly possible when muxing ALS files where from an extradata size of about 1050 put_bits would write data outside the buffer. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* latmenc: simplify using avpriv_copy_bits.Reimar Döffinger2012-04-121-6/+4
| | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* latmenc: Document assumptions when copying the AAC header.Reimar Döffinger2012-04-121-0/+2
| | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* latmenc: copy pce config from proper location.Reimar Döffinger2012-04-122-6/+6
| | | | | | | | | For the FATE test sample used, this only avoids a warning message. However for other samples like al05_44.mp4 the converted file can be played only after this fix. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* latmenc: fix muxing of byte-aligned DSE.Reimar Döffinger2012-04-123-1/+21
| | | | | | | | This will only work for DSEs that are first in a packet, but that is enough to fix handling of the reference files in fate-suite/aac (though most of them still have other issues). Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* ffmpeg: fix ticks_per_frame for the avi stream copy caseMichael Niedermayer2012-04-121-0/+1
| | | | | | Should not make any difference, but its more correct. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ratecontrol: Use ticks_per_frame to calculate fps.Michael Niedermayer2012-04-121-5/+9
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* wmalosslessdec: Reset residues to 0 if they were not decoded from bitstream.Jakub Stachowski2012-04-121-1/+2
| | | | | | | | | | | If channel residues are have not been decoded from bitstream, they should be initialized to 0 instead of using values from previous subframe. This causes bursts of noise in silent parts of some files. This patch fixes bug #1055 Reviewed-by: Benjamin Larsson <benjamin@southpole.se> Reviewed-by: Mashiat Sarker Shakkhar <mashiat.sarker@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* msmpeg4enc: fix stored fps valueMichael Niedermayer2012-04-121-1/+2
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavf: compute_pkt_fields, limit the pts upcorrection to mpegMichael Niedermayer2012-04-121-1/+4
| | | | | | | The pts correction conflicts with the ogg vorbis demuxer. Thanks-to: Justin Ruggles Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: add -benchmark_all option.Nicolas George2012-04-123-1/+36
|
* ffmpeg: move getutime to the start of the file.Nicolas George2012-04-121-18/+18
|
* mjpeg: fix crash with lowres and flipped imagesMichael Niedermayer2012-04-121-0/+4
| | | | | | Fixes Ticket1155 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* vf_lut: fix rgba map regressionMichael Niedermayer2012-04-121-3/+5
| | | | | | Fixes Ticket1184 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavf: always call avio_flush in av_write_trailer.Reimar Döffinger2012-04-123-6/+8
| | | | | | | | | | Otherwise for muxers like e.g. latmenc that never call avio_flush (and do not have a write_trailer function) a part of the data will always be missing. Also update references for the voc muxer, which was also buggy before and did not write out all data. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-116-39/+36
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avplay: Don't free video filters string until the end of decoding. movenc: small refactor mov_write_packet movenc: remove redundant check interplayvideo: fix av_dlog parameter type mismatch Drop some pointless #ifdefs. Conflicts: libavcodec/interplayvideo.c libavcodec/libxvidff.c libavcodec/snowenc.c libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avplay: Don't free video filters string until the end of decoding.Alex Converse2012-04-111-1/+1
| | | | | | | | | | | | av_freep()ing inside configure_video_filters() leaves a dangling reference in the calling code, and the filter string is needed again when reconfiguring video filters for a size change.
| * movenc: small refactor mov_write_packetLuca Barbato2012-04-111-27/+32
| | | | | | | | | | | | | | | | | | | | Share the formerly internal write_packet with the hinter and move the fragment flush logic to the user facing one since it is not concerned about movtrack-only streams. Fixes bug #263 Signed-off-by: Martin Storsjö <martin@martin.st>
| * movenc: remove redundant checkLuca Barbato2012-04-111-3/+0
| | | | | | | | | | | | The proper check is already in mov_write_header. Signed-off-by: Martin Storsjö <martin@martin.st>
| * interplayvideo: fix av_dlog parameter type mismatchDiego Biurrun2012-04-111-2/+3
| | | | | | | | libavcodec/interplayvideo.c:909:13: warning: format ‘%p’ expects argument of type ‘void *’, but argument 7 has type ‘GetByteContext’ [-Wformat]
| * Drop some pointless #ifdefs.Diego Biurrun2012-04-103-8/+0
| | | | | | | | The files are only compiled if the #ifdef conditions are met.
* | latmenc: error out when packet size is too large.Reimar Döffinger2012-04-111-1/+11
| | | | | | | | | | | | | | Previously it would just silently write out incorrect data. This also fixes a potential integer overflow in the allocation. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | latmenc: Fix ALS in LATM.Reimar Döffinger2012-04-111-2/+7
| | | | | | | | | | | | | | | | "Fix" in so far as at least it will no longer overread and possibly crash and makes somewhat sense, but no idea whether there is anything that can play the resulting files (FFmpeg can't). Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | latmenc: remove unused return value.Reimar Döffinger2012-04-111-3/+1
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | latmenc: remove dead code.Reimar Döffinger2012-04-111-3/+0
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | h261: move tables from header to .c file.Reimar Döffinger2012-04-115-152/+188
| | | | | | | | | | | | | | | | | | | | Currently they end up twice in the binary, since both encoder and decoder include the header and thus each gets their own copy. This is clearly nonsense for the const tables, but shouldn't be necessary for the RLTable either. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | ff_samples_to_time_base: support AV_NOPTS_VALUEMichael Niedermayer2012-04-111-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix memory leaks on failed ff_h264_decode_init()Dale Curtis2012-04-111-1/+3
| | | | | | | | | | | | | | | | | | | | During failure conditions ff_h264_decode_init() leaks memory allocated for nal units. Found via valgrind. Valgrind traces: http://pastebin.com/GqTqxs8T Signed-off-by: Dale Curtis <dalecurtis@chromium.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | oggparsevorbis: Remove code messing with cur_dts.Michael Niedermayer2012-04-111-1/+0
| | | | | | | | | | | | | | This code caused first_dts to become corrupt and in value to be around relative_ts. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swr: add a swr_flags AVOptionMichael Niedermayer2012-04-111-0/+1
| | | | | | | | | | | | | | Using swr_flags instead of plain flags will avoid conflicts that arise with plain flags and multiple libs (which all have AVOption flags) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: support changing dither parameters for swrMichael Niedermayer2012-04-111-0/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cmdutils: parse options for swrMichael Niedermayer2012-04-112-3/+16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swr: add a dither_scale parameter to tune the amplitude of the dither.Michael Niedermayer2012-04-113-1/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swr: pass context to swri_get_dither()Michael Niedermayer2012-04-113-5/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swr: add triangular highpass ditherMichael Niedermayer2012-04-113-1/+24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swr: generate more dither noise to improve quality.Michael Niedermayer2012-04-112-4/+9
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swr: add swr_get_class()Michael Niedermayer2012-04-112-0/+13
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swr: simplify code by using av_get_bytes_per_sample()Michael Niedermayer2012-04-112-7/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swr: fix copy & pasted comment to match the code.Michael Niedermayer2012-04-101-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vda: try to fix compileMichael Niedermayer2012-04-101-21/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-1028-1318/+1765
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (22 commits) rv40dsp x86: use only one register, for both increment and loop counter rv40dsp: implement prescaled versions for biweight. avconv: use default channel layouts when they are unknown avconv: parse channel layout string nutdec: K&R formatting cosmetics vda: Signal 4 byte NAL headers to the decoder regardless of what's in the extradata mem: Consistently return NULL for av_malloc(0) vf_overlay: implement poll_frame() vf_scale: support named constants for sws flags. lavc doxy: add all installed headers to doxy groups. lavc doxy: add avfft to the main lavc group. lavc doxy: add remaining avcodec.h functions to a misc doxygen group. lavc doxy: add AVPicture functions to a doxy group. lavc doxy: add resampling functions to a doxy group. lavc doxy: replace \ with / lavc doxy: add encoding functions to a doxy group. lavc doxy: add decoding functions to a doxy group. lavc doxy: fix formatting of AV_PKT_DATA_{PARAM_CHANGE,H263_MB_INFO} lavc doxy: add AVPacket-related stuff to a separate doxy group. lavc doxy: add core functions/definitions to a doxy group. ... Conflicts: ffmpeg.c libavcodec/avcodec.h libavcodec/vda.c libavcodec/x86/rv40dsp.asm libavfilter/vf_scale.c libavformat/nutdec.c libavutil/mem.c tests/ref/acodec/pcm_s24daud Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rv40dsp x86: use only one register, for both increment and loop counterChristophe GISQUET2012-04-101-23/+20
| | | | | | | | | | | | Around 10 cycles faster for luma. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * rv40dsp: implement prescaled versions for biweight.Christophe GISQUET2012-04-107-79/+112
| | | | | | | | | | | | | | | | | | | | Quite often, the original weights are multiple of 512. By prescaling them by 1/512 when they are computed (once per frame), no intermediate shifting is needed, and no prescaling on each call either. The x86 code already used that trick. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avconv: use default channel layouts when they are unknownJustin Ruggles2012-04-106-5/+61
| | | | | | | | | | | | | | | | | | If either input or output layout is known and the channel counts match, use the known layout for both. Otherwise choose the default layout based on av_get_default_channel_layout(). Changed some FATE references due to some WAVE files now having a non-zero channel mask.
| * avconv: parse channel layout stringJustin Ruggles2012-04-101-0/+36
| | | | | | | | | | This allows the user to use channel layout names instead of having to use the channel mask values.
| * nutdec: K&R formatting cosmeticsAsen Lekov2012-04-101-436/+500
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * vda: Signal 4 byte NAL headers to the decoder regardless of what's in the ↵Sebastien Zwickert2012-04-101-1/+20
| | | | | | | | | | | | extradata Signed-off-by: Martin Storsjö <martin@martin.st>