summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* doc/APIchanges: List merge commit hashes and version numbersMichael Niedermayer2013-02-151-167/+167
| | | | Signed-off-by: Michael Niedermayer <[email protected]>
* dshow: Fix MSVC support, remove av_export, which was apparently unneeded anyway.rogerdpack2013-02-153-6/+4
| | | | | | Also cleanup exported symbols Signed-off-by: Michael Niedermayer <[email protected]>
* Removing network.h from matroskadec.cVignesh Venkatasubramanian2013-02-141-1/+0
| | | | | | | Removing accidentally added include file. Signed-off-by: Vignesh Venkatasubramanian <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* ffmpeg: Check for parameter changes at the output of the audio filter graphMichael Niedermayer2013-02-141-0/+6
| | | | | | | | | | | It is currently possible that such changes leak through from the decoder as well as a filter could generate such changes itself. This commit blocks such changed packets unless the encoder declares support. Fixes out of array reads Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <[email protected]>
* Fix a few "its" vs "it's" typo.Clément Bœsch2013-02-144-5/+5
|
* doc/resampler: fix two typo.Clément Bœsch2013-02-141-1/+1
|
* lavfi/showspectrum: simplify intensity_color_table declaration.Clément Bœsch2013-02-141-4/+2
|
* lavfi/showspectrum: pretty-align constants.Clément Bœsch2013-02-141-8/+8
| | | | Binary object unchanged.
* Adding AlphaMode element to Matroska ParserVignesh Venkatasubramanian2013-02-142-0/+7
| | | | | | | | | Adding support for parsing AlphaMode element in the Track header and export that information as a metadata tag. This flag indicates presence of alpha channel data in BlockAdditional element. Signed-off-by: Vignesh Venkatasubramanian <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* apichanges: fix 2 wrong hashesMichael Niedermayer2013-02-141-2/+2
| | | | Signed-off-by: Michael Niedermayer <[email protected]>
* apichanges: Use , instead of / to seperate multiple hashesMichael Niedermayer2013-02-141-1/+1
| | | | Signed-off-by: Michael Niedermayer <[email protected]>
* apichanges: fix dateMichael Niedermayer2013-02-141-1/+1
| | | | Signed-off-by: Michael Niedermayer <[email protected]>
* fate: Add encrypted tta stream testJames Almer2013-02-142-0/+4
| | | | | Signed-off-by: James Almer <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* movenc: hotfix, dont store fiel for h264 / mpeg4-asp / dnxhdMichael Niedermayer2013-02-147-40/+43
| | | | | | | Other software does not store it in this case, and the information is provided by the codec stream Signed-off-by: Michael Niedermayer <[email protected]>
* lavfi/vf_ass: reindent after last commit.Nicolas George2013-02-141-7/+6
|
* lavfi/vf_ass: ignore subtitles decoding errors.Nicolas George2013-02-141-2/+6
| | | | | | | A broken packet with invalid data in the middle of the stream should not prevent from decoding the rest of the file. Work around trac ticket #2264.
* Write the fiel atom to mov files independently of the used video coded.Carl Eugen Hoyos2013-02-149-45/+46
| | | | | | | | | | | The QuickTime specification does not contain any hint that the atom must not be written in some cases and both the QuickTime and the AVID decoders do not fail if the atom is present. This change allows to signal (visually) interlaced streams with a codec different from uncompressed video. As a side-effect, this fixes ticket #2202
* lavfi: remove softskip libmpcodecs wrapperPaul B Mahol2013-02-144-106/+0
| | | | | | | It is supposed to be used with mencoder only and does nothing when used with ffmpeg. Signed-off-by: Paul B Mahol <[email protected]>
* lavfi: remove dsize libmpcodecs wrapperPaul B Mahol2013-02-144-127/+0
| | | | | | | Filter does nothing, and supposed funcionality is already available with native filter(s). Signed-off-by: Paul B Mahol <[email protected]>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-02-143-7/+8
|\ | | | | | | | | | | | | | | | | | | | | * qatar/master: doc/platform: Fix 10l typo dsputil: Move STRIDE_ALIGN macro to the only place it is used Conflicts: libavcodec/dsputil.h Merged-by: Michael Niedermayer <[email protected]>
| * doc/platform: Fix 10l typoDerek Buitenhuis2013-02-131-1/+1
| | | | | | | | | | | | This error was somehow missed for months. Signed-off-by: Derek Buitenhuis <[email protected]>
| * dsputil: Move STRIDE_ALIGN macro to the only place it is usedDiego Biurrun2013-02-132-6/+7
| |
* | doc/APIchanges: fix odd .01 versionsMichael Niedermayer2013-02-141-4/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | matroskadec: simplify additional_id writing codeMichael Niedermayer2013-02-141-4/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | Adding support for parsing BlockAdditionalVignesh Venkatasubramanian2013-02-145-4/+176
| | | | | | | | | | | | | | | | | | | | | | Matroska specification lists support for BlockAdditional element which is not supported by ffmpeg's matroska parser. This patch adds grammar definitions for parsing that element (and few other related elements) and then puts the data in AVPacket.side_data with new AVPacketSideDataType AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL. Signed-off-by: Vignesh Venkatasubramanian <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | h264: Use mb itself as memcpy anchor and assert the other anchors positionMichael Niedermayer2013-02-141-2/+3
| | | | | | | | | | | | This makes the code more robust against reordering or fields. Signed-off-by: Michael Niedermayer <[email protected]>
* | h264: remove clear_blocks call in threading init.Ronald S. Bultje2013-02-141-4/+3
| | | | | | | | | | | | | | | | Init code in that if statement goes down from 26716 cycles to 26047 cycles, i.e. the removal of the clear_blocks and smaller memcpy() together save around 670 cycles. Signed-off-by: Michael Niedermayer <[email protected]>
* | h264: Reset last_pocs in case of reference or frame number inconsistenciesMichael Niedermayer2013-02-132-0/+6
| | | | | | | | | | | | | | This prevents faulty increasing of has_b_frames Should fix Ticket 2062 Signed-off-by: Michael Niedermayer <[email protected]>
* | doc/dev: clarify public symbols prefixes.Clément Bœsch2013-02-131-2/+7
| |
* | WAV muxer: reindentDaniel Verkamp2013-02-131-13/+13
| |
* | swr: check channel layouts before using them.Michael Niedermayer2013-02-131-0/+10
| | | | | | | | | | | | | | Fixes out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <[email protected]>
* | lavfi/transpose: support more pix fmtsPaul B Mahol2013-02-131-22/+24
| | | | | | | | Signed-off-by: Paul B Mahol <[email protected]>
* | lavu/intreadwrite: add AV_[RW][BLN]48Paul B Mahol2013-02-131-1/+67
| | | | | | | | Signed-off-by: Paul B Mahol <[email protected]>
* | libvorbisdec: Remove AVFrame from contextMichael Niedermayer2013-02-131-6/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | libvorbisdec: set sample typeMichael Niedermayer2013-02-131-0/+1
| | | | | | | | | | | | Fixes regression Signed-off-by: Michael Niedermayer <[email protected]>
* | libcelt: decode directly to the user-provided AVFrame.Nicolas George2013-02-131-10/+7
| |
* | lavf/concatdec: allow probing.Nicolas George2013-02-132-3/+6
| |
* | lavf/concatdec: add signature directive.Nicolas George2013-02-132-0/+13
| |
* | lavf/concatdec: add safe option.Nicolas George2013-02-132-0/+64
| |
* | mjpegdec: pass nb_components into ljpeg_decode_yuv_scanMichael Niedermayer2013-02-131-3/+2
| | | | | | | | | | | | | | Fixes null pointer dereference Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <[email protected]>
* | evrcdec: decode directly to the user-provided AVFramePaul B Mahol2013-02-131-9/+5
| | | | | | | | Signed-off-by: Paul B Mahol <[email protected]>
* | paf: decode directly to the user-provided AVFramePaul B Mahol2013-02-131-14/+4
| | | | | | | | Signed-off-by: Paul B Mahol <[email protected]>
* | vima: decode directly to the user-provided AVFramePaul B Mahol2013-02-131-7/+4
| | | | | | | | Signed-off-by: Paul B Mahol <[email protected]>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-02-131-14/+35
|\| | | | | | | | | | | | | | | | | * qatar/master: lavr: fix mixing matrix reduction when normalization is disabled lavr: fix matrix reduction for upmixing in certain cases lavr: cosmetics: reindent Merged-by: Michael Niedermayer <[email protected]>
| * lavr: fix mixing matrix reduction when normalization is disabledJustin Ruggles2013-02-121-0/+11
| | | | | | | | | | | | | | In some cases when an input contributes fully to the corresponding output, other inputs may also contribute to the same output. This is the case, for example, for the default 5.1 to stereo downmix matrix without normalization.
| * lavr: fix matrix reduction for upmixing in certain casesJustin Ruggles2013-02-121-0/+10
| | | | | | | | | | Do not skip an output if the corresponding input contributes to other output channels.
| * lavr: cosmetics: reindentJustin Ruggles2013-02-121-14/+14
| |
* | Merge commit '1647da89dd8ac09a55c111589f7a30d7e6b87d90'Michael Niedermayer2013-02-133-76/+72
|\| | | | | | | | | | | | | | | | | | | * commit '1647da89dd8ac09a55c111589f7a30d7e6b87d90': lavr: make sure that the mix function is reset even if no mixing will be done lavr: print out the mix matrix in ff_audio_mix_set_matrix() ws-snd1: decode directly to the user-provided AVFrame wmavoice: decode directly to the user-provided AVFrame Merged-by: Michael Niedermayer <[email protected]>
| * lavr: make sure that the mix function is reset even if no mixing will be doneJustin Ruggles2013-02-121-21/+31
| | | | | | | | | | If the matrix reduction ends up with no mixing matrix needed, we need to still reset the mix function accordingly and log the info to the user.
| * lavr: print out the mix matrix in ff_audio_mix_set_matrix()Justin Ruggles2013-02-121-26/+29
| | | | | | | | This will print the new matrix if it is set after initialization.