summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* avcodec/hevc: Fix modulo operationsMichael Niedermayer2014-01-062-4/+4
| | | | | | | Fixes qp fields becoming out of range Fixes: asan_static-oob_e393a3_6998_WPP_A_ericsson_MAIN10_2.bit Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <[email protected]>
* avcodec/hevc_ps: check that VPS referenced from SPS existsMichael Niedermayer2014-01-061-0/+6
| | | | | | | | | | This matches how its done for SPS/PPS. An alternative to this is to check it when its used. Fixes null pointer dereference Fixes: signal_sigsegv_e30a43_1437_CIP_A_Panasonic_3.bit Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <[email protected]>
* avcodec/huffyuvdec: optimize decode_plane_bitstream(), use joint tables for ↵Michael Niedermayer2014-01-061-7/+16
| | | | | | | new yuv formats Reviewed-by: Paul B Mahol <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* fate: test version 3 of ffvhuffMichael Niedermayer2014-01-063-1/+10
| | | | Signed-off-by: Michael Niedermayer <[email protected]>
* avcodec/huffyuv: Support more 8bit YUV formatsMichael Niedermayer2014-01-063-30/+305
| | | | | Reviewed-by: Paul B Mahol <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-01-050-0/+0
|\ | | | | | | | | | | | | | | | | | | | | * qatar/master: cmdutils: update copyright year to 2014. Conflicts: cmdutils.c See: 0b1cfc4f28d81a8a49fdd5589b2eed06477abd61 Merged-by: Michael Niedermayer <[email protected]>
| * cmdutils: update copyright year to 2014.Johan Andersson2014-01-051-1/+1
| | | | | | | | Signed-off-by: Martin Storsjö <[email protected]>
* | Merge commit '7840c40445c9f52aeccba96de3d27613398bfbf2'Michael Niedermayer2014-01-051-0/+30
|\| | | | | | | | | | | | | * commit '7840c40445c9f52aeccba96de3d27613398bfbf2': (e)ac3dec: set AV_FRAME_DATA_MATRIXENCODING side data. Merged-by: Michael Niedermayer <[email protected]>
| * (e)ac3dec: set AV_FRAME_DATA_MATRIXENCODING side data.Tim Walker2014-01-051-0/+30
| |
* | Merge commit '13345fc1f86fc3615789e196d5a339c1c27c9068'Michael Niedermayer2014-01-055-9/+63
|\| | | | | | | | | | | | | * commit '13345fc1f86fc3615789e196d5a339c1c27c9068': (e)ac3: parse and store the Dolby Surround, Surround EX and Headphone mode flags. Merged-by: Michael Niedermayer <[email protected]>
| * (e)ac3: parse and store the Dolby Surround, Surround EX and Headphone mode ↵Tim Walker2014-01-055-9/+63
| | | | | | | | flags.
* | Merge commit 'e92123093dfdca0ef6608998240e2f9345d63bff'Michael Niedermayer2014-01-051-0/+4
|\| | | | | | | | | | | | | * commit 'e92123093dfdca0ef6608998240e2f9345d63bff': mlpdec: set AV_FRAME_DATA_MATRIXENCODING side data. Merged-by: Michael Niedermayer <[email protected]>
| * mlpdec: set AV_FRAME_DATA_MATRIXENCODING side data.Tim Walker2014-01-051-0/+4
| |
* | Merge commit '4b7f1a7ced0e98f2cc698d896f7ebab8d30eaa09'Michael Niedermayer2014-01-054-2/+62
|\| | | | | | | | | | | | | | | | | | | | | * 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 <[email protected]>
| * mlp: Parse TrueHD decoder channel modifiers and set the AVMatrixEncoding for ↵Tim Walker2014-01-054-2/+61
| | | | | | | | each substream.
* | Merge commit '30d70e79a6b4ac7f4eb66446a9da275161ef6ea7'Michael Niedermayer2014-01-051-0/+9
|\| | | | | | | | | | | | | * commit '30d70e79a6b4ac7f4eb66446a9da275161ef6ea7': dcadec: set AV_FRAME_DATA_MATRIXENCODING side data. Merged-by: Michael Niedermayer <[email protected]>
| * dcadec: set AV_FRAME_DATA_MATRIXENCODING side data.Tim Walker2014-01-051-0/+9
| |
* | Merge commit '6bfdb2de881372048be7fbda643417e1fd3ce93c'Michael Niedermayer2014-01-051-1/+2
|\| | | | | | | | | | | | | | | | | | | * commit '6bfdb2de881372048be7fbda643417e1fd3ce93c': dcadec: set the output channel mode more accurately. Conflicts: libavcodec/dcadec.c Merged-by: Michael Niedermayer <[email protected]>
| * dcadec: set the output channel mode more accurately.Tim Walker2014-01-051-1/+2
| | | | | | | | | | | | 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-055-1/+36
|\| | | | | | | | | | | | | | | | | | | * commit '5b4797a21db900b7d509660b7a4d49829089b004': avframe: add AV_FRAME_DATA_MATRIXENCODING side data type. Conflicts: libavutil/version.h Merged-by: Michael Niedermayer <[email protected]>
| * avframe: add AV_FRAME_DATA_MATRIXENCODING side data type.Tim Walker2014-01-055-1/+36
| | | | | | | | Includes a libavcodec utility function to update a frame's side data.
* | Merge commit '5c437fb'Michael Niedermayer2014-01-053-1/+8
|\| | | | | | | | | | | | | | | | | | | | | * commit '5c437fb': lavu: Add values for various Dolby flags to the AVMatrixEncoding enum. Conflicts: doc/APIchanges libavutil/version.h Merged-by: Michael Niedermayer <[email protected]>
| * lavu: Add values for various Dolby flags to the AVMatrixEncoding enum.Tim Walker2014-01-053-1/+8
| |
* | vp9_parse: don't use AVCodecParserContext as av_log context.Ronald S. Bultje2014-01-051-1/+1
| | | | | | | | | | | | Fixes trac ticket 3273. Signed-off-by: Michael Niedermayer <[email protected]>
* | avfilter/vf_format: check that the format list is not emptyMichael Niedermayer2014-01-051-0/+3
| | | | | | | | | | | | Fixes Ticket3210 Signed-off-by: Michael Niedermayer <[email protected]>
* | pulse: get latency only when neededFederico Simoncelli2014-01-051-7/+8
| | | | | | | | | | Signed-off-by: Federico Simoncelli <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | pulse: set time_base as multiple of sample_rateFederico Simoncelli2014-01-051-4/+10
| | | | | | | | | | | | | | | | | | 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 <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/nutdec: remove unused variableMichael Niedermayer2014-01-051-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | v4l2: setting device parameters earlyFederico Simoncelli2014-01-051-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | 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 <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-01-051-2/+9
|\| | | | | | | | | | | | | * qatar/master: configure: Support preprocessor macros as header names Merged-by: Michael Niedermayer <[email protected]>
| * configure: Support preprocessor macros as header namesDiego Biurrun2014-01-051-2/+9
| | | | | | | | | | | | | | | | | | | | 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 <[email protected]>
* | avformat/matroskaenc: warn when muxing video codec not supported by formatPeter Ross2014-01-051-0/+4
| | | | | | | | | | | | | | | | | | | | 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 <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-01-051-1/+1
|\| | | | | | | | | | | | | * qatar/master: sdp: Check that fmt->oformat is non-null before accessing it Merged-by: Michael Niedermayer <[email protected]>
| * sdp: Check that fmt->oformat is non-null before accessing itMartin Storsjö2014-01-051-1/+1
| | | | | | | | | | | | | | | | This avoids crashes when avserver tries to create an SDP, since d77f4af. CC: [email protected] Signed-off-by: Martin Storsjö <[email protected]>
* | Merge commit '9d18a7d3ec09d6d933d648570643fde924aa391a'Michael Niedermayer2014-01-051-2/+2
|\| | | | | | | | | | | | | | | | | | | * 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 <[email protected]>
| * fate: Update AAC ELD 5.1 ref for recent bugfixes.Alex Converse2014-01-041-1/+1
| |
* | Merge commit '7f29644108c5fbd80f160930b31b78b8704c1a49'Michael Niedermayer2014-01-053-5/+8
|\| | | | | | | | | | | | | * commit '7f29644108c5fbd80f160930b31b78b8704c1a49': aac: Fix low delay windowing. Merged-by: Michael Niedermayer <[email protected]>
| * aac: Fix low delay windowing.Alex Converse2014-01-043-5/+8
| | | | | | | | AAC LD uses a low overlap sine window instead of a KBD window.
* | Merge commit '42d1b41983971da63302ac3d12091cad1f3d6324'Michael Niedermayer2014-01-051-0/+4
|\| | | | | | | | | | | | | * commit '42d1b41983971da63302ac3d12091cad1f3d6324': fate: Add a test vector for AAC ELD with TNS. Merged-by: Michael Niedermayer <[email protected]>
| * fate: Add a test vector for AAC ELD with TNS.Alex Converse2014-01-041-0/+4
| |
* | Merge commit 'b2212dec0f011893ec68eecaa990170fa24050d7'Michael Niedermayer2014-01-054-2/+8
|\| | | | | | | | | | | | | | | | | | | | | * 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 <[email protected]>
| * aac: Fix TNS decoding for the 512 sample window family.Alex Converse2014-01-043-1/+7
| |
* | Merge commit 'e2096e2eaa9e75663d6bf0c37d342752aa5a146d'Michael Niedermayer2014-01-051-0/+4
|\| | | | | | | | | | | | | * commit 'e2096e2eaa9e75663d6bf0c37d342752aa5a146d': fate: Add a downsampled SBR testvector Merged-by: Michael Niedermayer <[email protected]>
| * fate: Add a downsampled SBR testvectorAlex Converse2014-01-041-0/+4
| |
* | avformat/mp3dec: fix start time in light of initial skip samplesMichael Niedermayer2014-01-051-0/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | lavf/file: fix help message first character casing for trunc optionStefano Sabatini2014-01-051-1/+1
| |
* | doc/protocols/file: fix semantical reverseStefano Sabatini2014-01-051-1/+1
| | | | | | | | | | | | Change "read" to "write" in introductory description. Spotted-by: Alexander Strasser <[email protected]>
* | doc/protocols/file: document general file protocol URL syntaxStefano Sabatini2014-01-051-4/+12
| | | | | | | | | | | | | | 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 <[email protected]>.
* | lavf/file: file_check: Handle file URLs that start with "file:"Alexander Strasser2014-01-041-5/+10
| | | | | | | | | | | | | | | | | | | | 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 <[email protected]>
* | avformat/oggparseopus: fix segmented timestampsMark Harris2014-01-041-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | 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 <[email protected]>