summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* avformat/avformat: improve the text about headerless formats in avformat_flush()Reimar Döffinger2015-03-051-2/+3
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat: add avformat_flush()wm42015-03-054-2/+28
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Allow AVFoundation compilation on OS X 10.7.Carl Eugen Hoyos2015-03-041-1/+3
| | | | | | Fixes ticket #4238. Reviewed-by: Thilo Borgmann
* lavf/mxf: Support ProRes decoding.Carl Eugen Hoyos2015-03-041-0/+1
| | | | Fixes ticket #4349.
* avformat/movenc: mark write_colr as experimentalMichael Niedermayer2015-03-041-1/+1
| | | | | | This way the flag can be flipped to a nowrite_colr, if people prefer that Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* libx264: update AQ options help for x264 build 144Peter Cordes2015-03-041-1/+4
| | | | | | | Regular autovariance is no longer "experimental", and a version of it with bias towards dark scenes is now in mainline x264. Signed-off-by: Peter Cordes <peter@cordes.ca>
* pixelutils: Comment on (lack of) sad_8x8_sse2Peter Cordes2015-03-041-0/+6
| | | | Signed-off-by: Peter Cordes <peter@cordes.ca>
* pixelutils: indent comments in pixdesc.h to be clearerPeter Cordes2015-03-041-3/+3
| | | | Signed-off-by: Peter Cordes <peter@cordes.ca>
* vf_showinfo: minimum widths for some early fieldsPeter Cordes2015-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | | Depending on FPS, the pts_time string often changes length: ... pts_time:36.1 ... ... pts_time:36.1333 ... etc. The length changes make the output bounce around horribly, making it hard to scan down a column farther right than pts_time. The solution is to set minimum widths for n, pts, pts_time, and pos. This patch doesn't touch any of the fields in mean / stddev. The widths aren't intended to be wide enough that they're never exceeded, but you'll see only an occasional ripple to a new alignment, rather than bouncing. (Some fields, like pos, increase monotonically, which is why I left the minimum width for the field be smaller than it often gets to.) Signed-off-by: Peter Cordes <peter@cordes.ca>
* Merge commit 'e767c9e8f2eaa116b61b8b6881b401b54bd320f5'Michael Niedermayer2015-03-041-18/+18
|\ | | | | | | | | | | | | | | | | | | * commit 'e767c9e8f2eaa116b61b8b6881b401b54bd320f5': flv: Validate and reject unsupported codecs Conflicts: libavformat/flvenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flv: Validate and reject unsupported codecsLuca Barbato2015-03-041-16/+17
| | | | | | | | | | | | And provide a more informative message in case of failure. CC: libav-stable@libav.org
* | Merge commit '87e85a133f3ce2f037b90e9c7bbca99951df6c15'Michael Niedermayer2015-03-041-1/+2
|\ \ | |/ | | | | | | | | | | * commit '87e85a133f3ce2f037b90e9c7bbca99951df6c15': aac: Relax reserved_bit validation Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aac: Relax reserved_bit validationVittorio Giovara2015-03-041-1/+2
| | | | | | | | | | | | | | | | | | | | | | Although the specification mandates this bit to zero, it may happen that software tools incorrectly flip it to one, invalidating a possibly valid stream. Relax this restriction, by failing only when AV_EF_BITSTREAM is set. This behaviour is similar to aac decoders in Firefox and Quicktime. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '25f613f8be3b51e4396b93cda131e4631ba54302'Michael Niedermayer2015-03-047-38/+67
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '25f613f8be3b51e4396b93cda131e4631ba54302': dca: Move syncword definitions to a separate header Conflicts: libavcodec/dca_parser.c libavformat/dtsdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dca: Move syncword definitions to a separate headerDiego Biurrun2015-03-047-34/+63
| |
* | Merge commit '1dc19729e92a96620000e09eba8e58cb458c9486'Michael Niedermayer2015-03-041-1/+0
|\ \ | |/ | | | | | | | | | | * commit '1dc19729e92a96620000e09eba8e58cb458c9486': rtpdec_asf: Don't free the payload context in the .close function Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec_asf: Don't free the payload context in the .close functionMartin Storsjö2015-03-041-1/+0
| | | | | | | | | | | | This was missed in bb4a310bb. This fixes a double free on close. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '62139b14e621f096d0f8ed90920d042b92867e40'Michael Niedermayer2015-03-041-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '62139b14e621f096d0f8ed90920d042b92867e40': fate: Specify the idct to use for the aic-oddsize test Conflicts: tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fate: Specify the idct to use for the aic-oddsize testMartin Storsjö2015-03-041-1/+1
| | | | | | | | | | | | | | This fixes fate on all architectures that have an optimized but not bitexact idct available. Signed-off-by: Martin Storsjö <martin@martin.st>
* | libavformat/mxfdec: refactor reading strong ref arrayMark Reid2015-03-041-39/+22
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '2a66a580678dd9401f4d95e01e0958ca51864b6f'Michael Niedermayer2015-03-041-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '2a66a580678dd9401f4d95e01e0958ca51864b6f': rtpdec_mpa_robust: Fix incrementing split_pos Conflicts: libavformat/rtpdec_mpa_robust.c See: ebf1f512e9916040dd96fa9f789ed4be5a39c349 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec_mpa_robust: Fix incrementing split_posMartin Storsjö2015-03-041-1/+1
| | | | | | | | | | | | | | | | | | This fixes an oversight in 96084251, in a refactoring done on top of Gilles' original patch. Pointed out by Gilles Chanteperdrix. Signed-off-by: Martin Storsjö <martin@martin.st>
* | ffplay: Switch to show waves mode if allocation/init of RDFT failsMichael Niedermayer2015-03-041-1/+4
| | | | | | | | | | | | | | | | Fixes null pointer dereference Found-by: Paweł <pantrombka@gmail.com> Reviewed-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/pngenc: Remove outer () from macroMichael Niedermayer2015-03-041-1/+1
| | | | | | | | | | | | | | | | | | The macro is implemented as a do{}while() enclosing this is () appears to be a GNU extension (6.1 Statements and Declarations in Expressions) the () is also unneeded and wrong as the macro returns no value Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'db5cc75f8b5620e7cd2d05762c3b087ab16d8c24'Michael Niedermayer2015-03-041-0/+1
|\ \ | |/ | | | | | | | | | | * commit 'db5cc75f8b5620e7cd2d05762c3b087ab16d8c24': wma.h: #include "avcodec.h" Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * wma.h: #include "avcodec.h"Anton Khirnov2015-03-031-0/+1
| | | | | | | | | | | | It's required for at least AVCodecContext. Fixes make checkheaders.
* | libavformat/avienc: Fix duration of audio segment in OpenDML master indexTobias Rapp2015-03-041-1/+14
| | | | | | | | | | | | | | | | | | | | | | Fixes the duration field of the OpenDML master index "indx" chunk to contain the number of samples instead of the number of packets for (linear/PCM) audio streams. This matches the OpenDML V1.02 standard text which states that the duration field shall contain "time span in stream ticks". Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | acvodec/lipopenjpeg: Fix pixel value shift for 12-bit pixel formatsVilius Grigaliūnas2015-03-031-2/+4
| | | | | | | | | | | | | | | | | | | | | | This fixes pixel values not being properly shifted in libopenjpeg_copyto16 and libopenjpeg_copy_to_packed16 methods. Pixel formats like xyz12le need to be shifted by AVComponentDescriptor::shift to get the correct values. Reviewed-by: Michael Bradshaw <mjbshaw@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mips/aaccoder: use variables instead of using register names directlyJames Cowgill2015-03-031-452/+477
| | | | | | | | | | | | | | | | | | | | | | | | | | On mips64, the registers t[4-7] do not exist. Instead of using a lot of #ifdef or defines to handle differing register names, use variables and let GCC allocate the registers automatically (like in the other mips assembly files). In get_band_cost_ESC_mips, t4 and t5 were renamed to t6 and t7 to avoid a variable name conflict. Signed-off-by: James Cowgill <james410@cowgill.org.uk> Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mips: use float* to hold pointer instead of intJames Cowgill2015-03-033-12/+12
| | | | | | | | | | | | | | | | This is obviously needed for 64-bit support. Signed-off-by: James Cowgill <james410@cowgill.org.uk> Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '0af3b65880573aa9b3375362eaab4f84140c7dde'Michael Niedermayer2015-03-032-2/+8
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '0af3b65880573aa9b3375362eaab4f84140c7dde': asf: do not export XMP metadata by default Conflicts: libavformat/asfdec.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * asf: do not export XMP metadata by defaultVittorio Giovara2015-03-032-2/+8
| | | | | | | | | | | | | | | | | | | | | | Similarly to what has been done for MOV, display XMP metadata only when users explicitly require it. The Extensible Metadata Platform tag can contain various kind of data which are not strictly related to the video file, such as history of edits and saves from the project file. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '994d8f3095180ba1b2c6040a97718e931a782b34'Michael Niedermayer2015-03-032-0/+61
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '994d8f3095180ba1b2c6040a97718e931a782b34': fate: Add AIC test with odd sizes Conflicts: tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fate: Add AIC test with odd sizesVittorio Giovara2015-03-032-0/+61
| |
* | Merge commit 'e878ec0d47cd6228c367b2f3128b76d7523f7255'Michael Niedermayer2015-03-031-2/+2
|\ \ | |/ | | | | | | | | | | * commit 'e878ec0d47cd6228c367b2f3128b76d7523f7255': aic: Fix decoding files with odd dimensions Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aic: Fix decoding files with odd dimensionsVittorio Giovara2015-03-031-2/+2
| | | | | | | | | | | | | | | | | | Normally the aic decoder finds the proper slice combination (multiple of some number less than 32) but in case of odd width, it resorts to the default values, which were actually swapped. The number of slices is modified to account for such odd width cases. CC: libav-stable@libav.org
* | ffmpeg: comment mpeg4 hackClément Bœsch2015-03-031-0/+1
| | | | | | | | See 3734c3ea51ae002a85366ee52dbc8f9df4cfd3db
* | libavformat/avio: added avio_put_str16beMark Reid2015-03-034-6/+30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | AAC: Fix M/S stereo encodingClaudio Freire2015-03-033-16/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes a pointer arithmetic bug in adjust_frame_information that resulted in heavily corrupted audio when using M/S encoding. Also, a backup copy of untransformed coefficients has to be kept around or attempts at re-processing the frame (which happens when hevavily overspending bits during transients) will result in re-encoding of the coefficients and subsequent corruption of the resulting stream. A/B testing shows the bug as corrected, but still cannot prove that M/S coding is a win at least in numbers. Limited listening tests do show improvement on M/S encoded samples in lower bitrates, but they're hidden among the other artifacts that remain to be corrected in the encoder. Some of the regressions flagged in the report do show poor stereo image (but not buggy), so M/S encoding is clearly not good enough yet to be defaulted to auto. In numbers, Patched against Unpatched, stereo_mode auto: Files: 114 Bitrates: 6 Tests: 683 Serious Regressions: 0 (0%) Regressions: 0 (0%) Improvements: 227 (33%) Big improvements: 92 (13%) Worst regression - mybloodrusts.wv - 256k - StdDev: 28.61 pSNR: -0.43 maxdiff: 1372.00 Best improvement - 60.wv - 384k - StdDev: -369.57 pSNR: 45.02 maxdiff: -13322.00 Average - StdDev: -80.56 pSNR: 2.49 maxdiff: -8858.00 Patched against Unpatched stereo_mode ms_off shows no difference. Patched stereo_mode auto vs Unpatched stereo_mode ms_off shows a small average improvement, just not too significant: Serious Regressions: 0 (0%) Regressions: 10 (1%) Improvements: 45 (6%) Big improvements: 2 (0%) Worst regression - Illinois.wv - 256k - StdDev: 33.20 pSNR: -2.03 maxdiff: 477.00 Best improvement - song_of_circomstances.flac - 384k - StdDev: -3.97 pSNR: 7.61 maxdiff: -826.00 Average - StdDev: -10.25 pSNR: 0.20 maxdiff: -281.00 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fix VP9 packet decoder returning 0 instead of the used data sizeSteve Lhomme2015-03-031-2/+2
| | | | | | | | | | | | See https://trac.videolan.org/vlc/ticket/14022#comment:6 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/rv10: check size of s->mb_width * s->mb_heightAndreas Cadhalpun2015-03-033-4/+12
| | | | | | | | | | | | | | If it doesn't fit into 12 bits it triggers an assertion. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mxfenc: adjust product name when opatom muxer is usedRobert Krüger2015-03-032-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/webp: validate the distance prefix codeAndreas Cadhalpun2015-03-031-0/+5
| | | | | | | | | | | | | | | | | | | | | | According to the WebP Lossless Bitstream Specification the highest allowed value for a prefix code is 39. If prefix_code is too large, the calculated extra_bits has an invalid value and triggers an assertion in get_bits. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/proresenc_kostya: fix coded_frame handlingClément Bœsch2015-03-021-7/+5
| |
* | Merge commit '33d412eb4a2a083c1514ddbe69295b37e1918a8c'Michael Niedermayer2015-03-020-0/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '33d412eb4a2a083c1514ddbe69295b37e1918a8c': dashenc: Simplify code by using a local variable Conflicts: libavformat/dashenc.c See: b86af8da3100a7eef3247747cd469b988f134e0d Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dashenc: Simplify code by using a local variableMartin Storsjö2015-03-021-2/+2
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/dashenc: Update codec_str on extradata_size changeTimo Rothenpieler2015-03-021-1/+17
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/dashenc: Use local variable instead of duplicated dereferencesTimo Rothenpieler2015-03-021-2/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_tblend: use av_frame_free for freeing an AVFrameClément Bœsch2015-03-021-1/+1
| |
* | avfilter/lavfutils: use av_frame_free for freeing an AVFrameClément Bœsch2015-03-021-1/+1
| |
OpenPOWER on IntegriCloud