summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit '4b7f1a7ced0e98f2cc698d896f7ebab8d30eaa09'Michael Niedermayer2014-01-05
|\ | | | | | | | | | | | | | | | | | | | | * commit '4b7f1a7ced0e98f2cc698d896f7ebab8d30eaa09': mlp: Parse TrueHD decoder channel modifiers and set the AVMatrixEncoding for each substream. Conflicts: libavcodec/mlp_parser.h libavcodec/mlpdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mlp: Parse TrueHD decoder channel modifiers and set the AVMatrixEncoding for ↵Tim Walker2014-01-05
| | | | | | | | each substream.
* | Merge commit '30d70e79a6b4ac7f4eb66446a9da275161ef6ea7'Michael Niedermayer2014-01-05
|\| | | | | | | | | | | | | * commit '30d70e79a6b4ac7f4eb66446a9da275161ef6ea7': dcadec: set AV_FRAME_DATA_MATRIXENCODING side data. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dcadec: set AV_FRAME_DATA_MATRIXENCODING side data.Tim Walker2014-01-05
| |
* | Merge commit '6bfdb2de881372048be7fbda643417e1fd3ce93c'Michael Niedermayer2014-01-05
|\| | | | | | | | | | | | | | | | | | | * commit '6bfdb2de881372048be7fbda643417e1fd3ce93c': dcadec: set the output channel mode more accurately. Conflicts: libavcodec/dcadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dcadec: set the output channel mode more accurately.Tim Walker2014-01-05
| | | | | | | | | | | | When downmixing 2.1 to 2-channel, if the 2.0 portion is Lt/Rt, sum-difference or dual mono, the actual output will be the same (with the LFE either mixed-in or discarded). Also, when downmixing an arbitrary layout to 2-channel, if the bitstream contains custom downmix coefficients targeting Lt/Rt, then the output will be Lt/Rt rather than regular Stereo.
* | Merge commit '5b4797a21db900b7d509660b7a4d49829089b004'Michael Niedermayer2014-01-05
|\| | | | | | | | | | | | | | | | | | | * commit '5b4797a21db900b7d509660b7a4d49829089b004': avframe: add AV_FRAME_DATA_MATRIXENCODING side data type. Conflicts: libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avframe: add AV_FRAME_DATA_MATRIXENCODING side data type.Tim Walker2014-01-05
| | | | | | | | Includes a libavcodec utility function to update a frame's side data.
* | Merge commit '5c437fb'Michael Niedermayer2014-01-05
|\| | | | | | | | | | | | | | | | | | | | | * commit '5c437fb': lavu: Add values for various Dolby flags to the AVMatrixEncoding enum. Conflicts: doc/APIchanges libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavu: Add values for various Dolby flags to the AVMatrixEncoding enum.Tim Walker2014-01-05
| |
* | vp9_parse: don't use AVCodecParserContext as av_log context.Ronald S. Bultje2014-01-05
| | | | | | | | | | | | Fixes trac ticket 3273. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_format: check that the format list is not emptyMichael Niedermayer2014-01-05
| | | | | | | | | | | | Fixes Ticket3210 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | pulse: get latency only when neededFederico Simoncelli2014-01-05
| | | | | | | | | | Signed-off-by: Federico Simoncelli <fsimonce@redhat.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | pulse: set time_base as multiple of sample_rateFederico Simoncelli2014-01-05
| | | | | | | | | | | | | | | | | | The stream time_base has been changed to be a multiple of the device sample_rate. Now the frame_duration computation is simpler and a message will warn about problematic frame_size values. Signed-off-by: Federico Simoncelli <fsimonce@redhat.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/nutdec: remove unused variableMichael Niedermayer2014-01-05
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | v4l2: setting device parameters earlyFederico Simoncelli2014-01-05
| | | | | | | | | | | | | | | | | | | | | | | | Setting the v4l2 device parameters may influence video properties such as width, height and pixel format. This patch moves v4l2_set_parameters to be executed before fetching the video properties, avoiding errors such as (pal vs ntsc): The v4l2 frame is 829440 bytes, but 691200 bytes are expected Signed-off-by: Federico Simoncelli <fsimonce@redhat.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-01-05
|\| | | | | | | | | | | | | * qatar/master: configure: Support preprocessor macros as header names Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Support preprocessor macros as header namesDiego Biurrun2014-01-05
| | | | | | | | | | | | | | | | | | | | New versions of FreeType have moved the location of their API header(s) and hide the location behind a macro. Since the location changes between versions and no other way to know the location exists, this workaround becomes necessary. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | avformat/matroskaenc: warn when muxing video codec not supported by formatPeter Ross2014-01-05
| | | | | | | | | | | | | | | | | | | | This occurs for video codecs that have codec_tag set, but are are not listed in ff_codec_bmp_tags (e.g. AV_CODEC_ID_BINKAUDIO, AV_CODEC_ID_IFF_ILBM). Fixes ticket #3269. Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-01-05
|\| | | | | | | | | | | | | * qatar/master: sdp: Check that fmt->oformat is non-null before accessing it Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * sdp: Check that fmt->oformat is non-null before accessing itMartin Storsjö2014-01-05
| | | | | | | | | | | | | | | | This avoids crashes when avserver tries to create an SDP, since d77f4af. CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '9d18a7d3ec09d6d933d648570643fde924aa391a'Michael Niedermayer2014-01-05
|\| | | | | | | | | | | | | | | | | | | * commit '9d18a7d3ec09d6d933d648570643fde924aa391a': fate: Update AAC ELD 5.1 ref for recent bugfixes. also reenable fate-aac-er_ad6000np_44_ep0, as this commit updates the pcm reference, so that the test works again Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fate: Update AAC ELD 5.1 ref for recent bugfixes.Alex Converse2014-01-04
| |
* | Merge commit '7f29644108c5fbd80f160930b31b78b8704c1a49'Michael Niedermayer2014-01-05
|\| | | | | | | | | | | | | * commit '7f29644108c5fbd80f160930b31b78b8704c1a49': aac: Fix low delay windowing. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aac: Fix low delay windowing.Alex Converse2014-01-04
| | | | | | | | AAC LD uses a low overlap sine window instead of a KBD window.
* | Merge commit '42d1b41983971da63302ac3d12091cad1f3d6324'Michael Niedermayer2014-01-05
|\| | | | | | | | | | | | | * commit '42d1b41983971da63302ac3d12091cad1f3d6324': fate: Add a test vector for AAC ELD with TNS. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fate: Add a test vector for AAC ELD with TNS.Alex Converse2014-01-04
| |
* | Merge commit 'b2212dec0f011893ec68eecaa990170fa24050d7'Michael Niedermayer2014-01-05
|\| | | | | | | | | | | | | | | | | | | | | * commit 'b2212dec0f011893ec68eecaa990170fa24050d7': aac: Fix TNS decoding for the 512 sample window family. also temporarily disable fate-aac-er_ad6000np_44_ep0 as this commit causes a mismatch with the reference pcm file The test will be reenabled after all fixes and with a new pcm reference Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aac: Fix TNS decoding for the 512 sample window family.Alex Converse2014-01-04
| |
* | Merge commit 'e2096e2eaa9e75663d6bf0c37d342752aa5a146d'Michael Niedermayer2014-01-05
|\| | | | | | | | | | | | | * commit 'e2096e2eaa9e75663d6bf0c37d342752aa5a146d': fate: Add a downsampled SBR testvector Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fate: Add a downsampled SBR testvectorAlex Converse2014-01-04
| |
* | avformat/mp3dec: fix start time in light of initial skip samplesMichael Niedermayer2014-01-05
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/file: fix help message first character casing for trunc optionStefano Sabatini2014-01-05
| |
* | doc/protocols/file: fix semantical reverseStefano Sabatini2014-01-05
| | | | | | | | | | | | Change "read" to "write" in introductory description. Spotted-by: Alexander Strasser <eclipse7@gmx.net>
* | doc/protocols/file: document general file protocol URL syntaxStefano Sabatini2014-01-05
| | | | | | | | | | | | | | Also drop confusing ff* tools reference about exceptions to the file:FILENAME syntax, which is not ff* tool specific. With various edits by Alexander Strasser <eclipse7@gmx.net>.
* | lavf/file: file_check: Handle file URLs that start with "file:"Alexander Strasser2014-01-04
| | | | | | | | | | | | | | | | | | | | Handle the URL analog to file_open, it may contain a "file:" prefix. Skip it. Make access checks to file URLs starting with "file:" work. Fix part of ticket #3249. Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
* | avformat/oggparseopus: fix segmented timestampsMark Harris2014-01-04
| | | | | | | | | | | | | | | | | | | | | | | | Fix timestamp calculation for code 3 Ogg Opus packets with less than 2 bytes in the last segment (e.g. packet length 255 or 256). A sample that would seek incorrectly in ffplay can be created with: ffmpeg -i in.wav -b:a 34k -vbr off -frame_duration 60 out.opus and libopus 1.1 Also do not read past the end of the buffer when a packet has length 0. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/oggdec: dont read timestamps from EOS pages of ogm videosMichael Niedermayer2014-01-04
| | | | | | | | | | | | | | Some muxers store invalid timestamps there, which breaks seeking Fixes Ticket2739 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: fix rounding error accumulation for generated dts in ↵Michael Niedermayer2014-01-04
| | | | | | | | | | | | | | | | | | compute_pkt_fields() This only updates the case where there is no B frame reordering delay. Tested-by: Anssi Hannula <anssi.hannula@iki.fi> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/rational: av_add_stable() test codeMichael Niedermayer2014-01-04
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/mathematics: add av_add_stable()Michael Niedermayer2014-01-04
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Changelog: add nuts side & metadata supportMichael Niedermayer2014-01-04
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/nut: add support for per frame side & meta data with version 4Michael Niedermayer2014-01-04
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-01-04
|\| | | | | | | | | | | | | * qatar/master: arm: Use the matching endfunc macro instead of the assembler directive directly Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * arm: Use the matching endfunc macro instead of the assembler directive directlyMartin Storsjö2014-01-04
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '2ad4ee345a4216aef3999f57dd14c56128d27a13'Michael Niedermayer2014-01-04
|\| | | | | | | | | | | | | * commit '2ad4ee345a4216aef3999f57dd14c56128d27a13': arm: Add a missing endfunc macro call Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * arm: Add a missing endfunc macro callMartin Storsjö2014-01-04
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | avfilter/lut3d: fix channel order in Iridas format parsing.Clément Bœsch2014-01-04
| | | | | | | | | | | | | | | | | | | | According to http://doc.iridas.com/index.php?title=LUT_Formats for 3D textures, the data is also RGB, and ordered in such a way that the red coordinate changes fastest, then the green coordinate, and finally, the blue coordinate changes slowest: Fixes Ticket #3236.
* | avcodec/rv30: put the rpr check back in init with the max vs bits bug fixedMichael Niedermayer2014-01-04
| | | | | | | | | | | | | | | | Its usefull to know immediatly if extradata is wrong and not just when later the decoder tries to use it. This check was removed by: a6a2282c25abe43e352010a7c3fbc92994c0bc1c Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/rv30: check rpr before use against maximumMichael Niedermayer2014-01-04
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-12 01:31:42 +0000