summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | | lavd/alsa: simplify reordering functions definition.Nicolas George2013-02-02
| | |
* | | avfilter/vf_hqdn3d.h: restore author attribution, history and project nameMichael Niedermayer2013-02-02
| | | | | | | | | | | | | | | | | | See git blame of pre split avfilter/vf_hqdn3d.c Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avfilter/x86/vf_hqdn3d_init: fix author attribution & project nameMichael Niedermayer2013-02-02
| | | | | | | | | | | | | | | | | | Reference: 7a1944b907179212e7073b821fdc60e27d536e4a Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-02-02
|\ \ \ | |/ / |/| / | |/ | | | | | | * qatar/master: vf_hqdn3d: x86: Add proper arch optimization initialization Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_hqdn3d: x86: Add proper arch optimization initializationDiego Biurrun2013-02-01
| |
* | Map the interlaced flag of yuv4mpeg streams to AVCodecContext->field_order.Carl Eugen Hoyos2013-02-02
| | | | | | | | Fixes a part of ticket #2190.
* | build-sys: Fix pkgconfig files when ffmpeg is built with --build-suffixSteven Boswell II2013-02-02
| | | | | | | | | | | | | | Tested-on: Fedora Core 14, 16, and 17. Tested-on: Ubuntu by commiter Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Do not fail for mixed interlaced / non-interlaced YUV4MPEG streams.Carl Eugen Hoyos2013-02-02
| |
* | vp56: remove clear_blocks call, and clear alpha plane U/V DC only.Ronald S. Bultje2013-02-01
| | | | | | | | | | | | | | | | The non-alpha and alpha-Y planes are cleared in the idct_put/add() calls. For the alpha U/V planes, we only care about the DC for entropy context prediction purposes, the rest of the data is unused. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Do not change codec in flv streams if the user has forced a codec.Carl Eugen Hoyos2013-02-01
| | | | | | | | Fixes ticket #2218.
* | ffmpeg: fix broken channel_layout optionMatthieu Bouron2013-02-01
| | | | | | | | | | | | Fixes ticket #2163. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/filters: fix syntax and typo for the afade curve optionStefano Sabatini2013-02-01
| |
* | doc/filters: create a dedicated examples section for lut*, and itemizeStefano Sabatini2013-02-01
| |
* | doc/filters: fix syntax and description for the lut* optionsStefano Sabatini2013-02-01
| |
* | doc/muxers: fix level for the segment options subsectionStefano Sabatini2013-02-01
| | | | | | | | Properly declare it like a @subsection, rather than as a @section.
* | doc/muxers.texi: Fix mp3 picture attachment documentation.Carl Eugen Hoyos2013-02-01
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-02-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Use proper "" quotes for local header #includes ppc: fmtconvert: Drop two unused variables. bink demuxer: set framerate. Conflicts: libavcodec/kbdwin.c libavcodec/ppc/fmtconvert_altivec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Use proper "" quotes for local header #includesDiego Biurrun2013-02-01
| |
| * ppc: fmtconvert: Drop two unused variables.Diego Biurrun2013-02-01
| |
| * bink demuxer: set framerate.Anton Khirnov2013-02-01
| |
* | Merge commit '1730ca2eca42974af0c29f38a0770997cba2f0da'Michael Niedermayer2013-02-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1730ca2eca42974af0c29f38a0770997cba2f0da': bink demuxer: check malloc return value See: commit e400b95b3205d5b861346f525cf6f423d93d2f04 Author: Paul B Mahol <onemda@gmail.com> Date: Sat Jun 9 10:57:14 2012 +0000 bink: check av_mallocz() return value Signed-off-by: Paul B Mahol <onemda@gmail.com> Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * bink demuxer: check malloc return valueAnton Khirnov2013-02-01
| |
* | Merge commit 'f2960097e42ddf9a356bab6547f87906f6999e0a'Michael Niedermayer2013-02-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f2960097e42ddf9a356bab6547f87906f6999e0a': bink: fix a check for the first frame. doc/developer: Drop obsolete MPlayer reference doc/developer: Add ISC license to list of acceptable licenses doc/developer: Add web links for all suggested licenses Conflicts: doc/developer.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * bink: fix a check for the first frame.Anton Khirnov2013-02-01
| | | | | | | | | | Packet pts is a very unreliable indicator, use AVCodecContext.frame_number instead.
| * doc/developer: Drop obsolete MPlayer referenceDiego Biurrun2013-02-01
| |
| * doc/developer: Add ISC license to list of acceptable licensesDiego Biurrun2013-02-01
| |
| * doc/developer: Add web links for all suggested licensesDiego Biurrun2013-02-01
| |
* | dict: fix memleakMichael Niedermayer2013-02-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'mjbshaw/master'Michael Niedermayer2013-02-01
|\ \ | | | | | | | | | | | | | | | | | | | | | * mjbshaw/master: libopenjpegenc: simplify switch statement libopenjpegenc: add support for pix fmt gbrp (8-16 bit) Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | libopenjpegenc: simplify switch statementMichael Bradshaw2013-01-31
| | | | | | | | | | | | Signed-off-by: Michael Bradshaw <mjbshaw@gmail.com>
| * | libopenjpegenc: add support for pix fmt gbrp (8-16 bit)Michael Bradshaw2013-01-31
| | | | | | | | | | | | Signed-off-by: Michael Bradshaw <mjbshaw@gmail.com>
* | | matroska: fixed missing S_DVBSUB subtitlesAllan Kristensen2013-02-01
| | |
* | | vc1dec: fieldtx is only valid for interlaced framesSebastian Sandberg2013-02-01
| | | | | | | | | | | | | | | | | | the fieldtx_plane is not cleared for interlaced fields Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | vc1dec: fix block_offMichael Niedermayer2013-01-31
| | | | | | | | | | | | | | | | | | Fixes corruption of motion_val Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | doc/indevs: document v4l2 optionsStefano Sabatini2013-01-31
| | | | | | | | | | | | Reviewed-By: Giorgio Vazzana <mywing81@gmail.com>
* | | doc/indevs: itemize examples for the v4l2 deviceStefano Sabatini2013-01-31
| | |
* | | lavfi/buffersrc: forward filter_frame errors.Nicolas George2013-01-31
| | | | | | | | | | | | Note: The ret variable was unused.
* | | lavfi/af_amerge: set outbuf->audio->channels.Nicolas George2013-01-31
| | | | | | | | | | | | | | | | | | The value is lost because of avfilter_copy_buffer_ref_props(). Fix trac ticket #2217.
* | | lavfi/af_amerge: check for buffer queue overflows.Nicolas George2013-01-31
| | | | | | | | | | | | | | | | | | Without that test, ff_bufqueue_add silently discards the oldest buffer, that leaves in[i].nb_samples inconsistent, and causes later a segfault.
* | | lavfi/bufferqueue: add ff_bufqueue_is_full().Nicolas George2013-01-31
| | |
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-01-31
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | * qatar/master: x86: hpel: Move {avg,put}_pixels16_sse2 to hpeldsp configure: Add a comment indicating why uclibc is checked before glibc Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | x86: hpel: Move {avg,put}_pixels16_sse2 to hpeldspDiego Biurrun2013-01-31
| | |
| * | configure: Add a comment indicating why uclibc is checked before glibcDiego Biurrun2013-01-31
| | |
* | | Merge commit '29f1fa74225e9fdbab6d590857edbecb51cf74da'Michael Niedermayer2013-01-31
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '29f1fa74225e9fdbab6d590857edbecb51cf74da': configure: Move newlib libc check before mingw libc check avisynth: Change demuxer name to avoid conflicts with AVS Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | configure: Move newlib libc check before mingw libc checkDiego Biurrun2013-01-31
| | | | | | | | | | | | | | | | | | On Cygwin systems MinGW headers can be present if the corresponding packages have been installed. Since the MinGW libc is checked for first, this results in newlib getting misdetected as MinGW libc.
| * | avisynth: Change demuxer name to avoid conflicts with AVSDiego Biurrun2013-01-31
| | |
* | | Merge commit 'a65f965c04bfa27adedc0409c14cc05903f483d0'Michael Niedermayer2013-01-31
|\| | | | | | | | | | | | | | | | | | | | * commit 'a65f965c04bfa27adedc0409c14cc05903f483d0': mpegvideo: Do REBASE_PICTURE with byte pointers Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | mpegvideo: Do REBASE_PICTURE with byte pointersMartin Storsjö2013-01-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | REBASE_PICTURE (more specifically, this half of it) takes a Picture pointer that points into one larger struct, finds the offset of that Picture within the struct and finds the corresponding field within another instance of a similar struct. The pointer difference "pic - (Picture*)old_ctx" is a value given in sizeof(Picture) units, and when applied back on (Picture*)new_ctx gets multiplied back with sizeof(Picture). Many compilers seem to optimize out this division/multiplication, but not all do. GCC 4.2 on OS X doesn't seem to remove the division/multiplication, therefore the new pointer didn't turn out to point to exactly the right place in the new struct since it only had sizeof(Picture) granularity (and the Picture is not aligned on a sizeof(Picture) boundary within the encompassing struct). This bug has been present before 47318953d as well - with H264, pointers to h->ref_list[0][0] pointed to 88 bytes before h->ref_list[0][0] after the rebase. After shrinking Picture, the difference ended up even larger, making writes via such a Picture pointer overwrite other fields at random in H264Context, ending up in crashes later. This fixes H264 multithreaded decoding on OS X with GCC 4.2. Signed-off-by: Martin Storsjö <martin@martin.st>
* | | Merge commit 'a5ba798c16d0614d982a76755fdd72b37d437170'Michael Niedermayer2013-01-31
|\| | | | | | | | | | | | | | | | | | | | * commit 'a5ba798c16d0614d982a76755fdd72b37d437170': dsputil: remove unused functions copy_block{2, 4, 8, 16}. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | dsputil: remove unused functions copy_block{2, 4, 8, 16}.Ronald S. Bultje2013-01-30
| | |