summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* avformat/mp3dec: optimize mp3_seek() for dir < 0Michael Niedermayer2014-03-021-0/+2
| | | | | | this minimizes the amount of protocol seeks and reading needed in that case Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/aviobuf: optimize sequential backward seekingMichael Niedermayer2014-03-011-1/+12
| | | | | | This reduces the number of protocol seeks Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/aviobuf: factorize buffer_size outMichael Niedermayer2014-03-011-2/+4
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* RELEASE: update for 2.2Michael Niedermayer2014-03-011-1/+1
| | | | | Found-by: Timothy Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* x86/synth_filter: add synth_filter_sseJames Almer2014-03-012-29/+57
| | | | | | | Build only on x86_32 targets. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* HLS: Handle the case when hls_list_size=0. Playlist file should contain all ↵Senthilnathan M2014-03-011-2/+2
| | | | | | | the segments. Fixes bug #3376. Signed-off-by: Senthilnathan M <senthil.codr@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-03-010-0/+0
|\ | | | | | | | | | | | | | | | | | | | | * qatar/master: qt-faststart: Add a note about the -movflags +faststart feature Conflicts: tools/qt-faststart.c See: 2574d62d0dd34df762aa2d80c7d6381918a80ed1 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * qt-faststart: Add a note about the -movflags +faststart featureLou Logan2014-03-011-1/+2
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'ea7f79f93796d68559a495be824b6bbd94dfe5f6'Michael Niedermayer2014-03-011-8/+8
|\ \ | |/ | | | | | | | | | | | | | | * commit 'ea7f79f93796d68559a495be824b6bbd94dfe5f6': qt-faststart: Avoid unintentionally sign extending BE_32 See: 582f36ca3fb1c69dbe3478f174d36278f5dd3f63 See: 69ce34c796dd2d595f3312848cf6d0c87506e0d0 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * qt-faststart: Avoid unintentionally sign extending BE_32Martin Storsjö2014-03-011-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | Without this cast, the BE_32() expression is sign extended when assigned to an uint64_t, since the uint8_t|uint8_t expression is promoted to an int. Also avoid undefined behaviour when left shifting an uint8_t by 24 by casting it to an uint32_t explicitly before shifting. Based on a patch by Michael Niedermayer. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'bb95334c34d0d9abccea370ae25c4765d7764ab8'Michael Niedermayer2014-03-011-4/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'bb95334c34d0d9abccea370ae25c4765d7764ab8': qt-faststart: Check offset_count before reading from the moov_atom buffer Conflicts: tools/qt-faststart.c See: 0ea4742341726ebe42c301bc0d6426cfa01dd134 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * qt-faststart: Check offset_count before reading from the moov_atom bufferMichael Niedermayer2014-03-011-0/+8
| | | | | | | | | | CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '63848854256a024a19435e87d6bc76fffa65e81e'Michael Niedermayer2014-03-011-1/+5
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '63848854256a024a19435e87d6bc76fffa65e81e': qt-faststart: Check the ftello() return codes Conflicts: tools/qt-faststart.c See: 4a2297294fa269e05aa2b3fe36b2ea231caa6dca Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * qt-faststart: Check the ftello() return codesMichael Niedermayer2014-03-011-2/+6
| | | | | | | | | | | | This silences a warning in the coverity static analyzer. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '03c2a66fcff9707f71ffef7e61ce5e3973220d4b'Michael Niedermayer2014-03-011-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '03c2a66fcff9707f71ffef7e61ce5e3973220d4b': qt-faststart: Fix the signedness of variables keeping the ftello return values Conflicts: tools/qt-faststart.c See: 1838961357e38402be64c0c82a2f08e4e85a0c01 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * qt-faststart: Fix the signedness of variables keeping the ftello return valuesMichael Niedermayer2014-03-011-2/+2
| | | | | | | | | | | | | | | | These variables are assigned the return values of ftello, which returns an off_t, which is a signed type. On errors, ftello returns -1, thus make sure this error return value can be stored properly. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '5612244351b2eb3cb4e6225861a0f55aa5d0c475'Michael Niedermayer2014-03-011-4/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '5612244351b2eb3cb4e6225861a0f55aa5d0c475': qt-faststart: Check fseeko() return codes Conflicts: tools/qt-faststart.c See: 0de41ead6f9034e0a834abe51028a02aee094990 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * qt-faststart: Check fseeko() return codesMichael Niedermayer2014-03-011-6/+18
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'ea15a9a5d8fa6a71af3101b2af18c4dcac07987f'Michael Niedermayer2014-03-011-3/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'ea15a9a5d8fa6a71af3101b2af18c4dcac07987f': qt-faststart: Simplify code by using a MIN() macro Conflicts: tools/qt-faststart.c See: 59003fe7c064e98359cce83b1b727fb1026bdf12 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * qt-faststart: Simplify code by using a MIN() macroMichael Niedermayer2014-03-011-4/+3
| | | | | | | | | | | | | | | | qt-faststart doesn't use the normal libav headers at all since it's supposed to be a completely standalone tool, so we implement the macro locally in this file. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '3cbc7ef3d60b6af3617079f24a4f401d83353003'Michael Niedermayer2014-03-010-0/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '3cbc7ef3d60b6af3617079f24a4f401d83353003': qt-faststart: Increase the copy buffer size to 64 KB Conflicts: tools/qt-faststart.c See: f4d9148fe282879b9fcc755767c9c04de9ddbcfa Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * qt-faststart: Increase the copy buffer size to 64 KBMartin Storsjö2014-03-011-1/+1
| | | | | | | | | | | | | | | | | | Copying data in chunks of 1 KB is a little wasteful. 64 KB should still easily fit on the stack, so there's no need to allocate it dynamically. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'd1f9563d502037239185c11578cc614bdf0c5870'Michael Niedermayer2014-03-011-2/+3
|\ \ | |/ | | | | | | | | | | * commit 'd1f9563d502037239185c11578cc614bdf0c5870': pthread_frame: flush all threads on flush, not just the first one Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pthread_frame: flush all threads on flush, not just the first oneAnton Khirnov2014-02-281-2/+3
| | | | | | | | | | | | | | | | | | avcodec_flush_buffers() must release all internally held references according to its documentation, for which all the threads need to be flushed. CC:libav-stable@libav.org Bug-Id: vlc/9665
* | Merge commit 'bc6461c2861b7d482a037d3b3e2b44ad48805fa0'Michael Niedermayer2014-03-010-0/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit 'bc6461c2861b7d482a037d3b3e2b44ad48805fa0': af_compand: replace strtok_r() with av_get_token() Conflicts: configure libavfilter/af_compand.c Not merged as requested by ubitux Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * af_compand: replace strtok_r() with av_get_token()Anton Khirnov2014-02-282-9/+24
| |
* | Merge commit 'fb3b2f5d923a6e19d80f21eb4e081674bceec810'Michael Niedermayer2014-03-011-7/+8
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'fb3b2f5d923a6e19d80f21eb4e081674bceec810': configure: Set the thread type after resolving dependencies Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Set the thread type after resolving dependenciesDiego Biurrun2014-02-281-8/+8
| | | | | | | | | | | | | | | | | | | | | | A threading type might be detected originally, but later disabled if one of its dependencies is unavailable. This makes sure that the threading support item in the configure output is right for setups where w32threads are available but native atomics aren't. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '2f02bbcca050936686482453078e83dc25493da0'Michael Niedermayer2014-03-014-8/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '2f02bbcca050936686482453078e83dc25493da0': build: Let the ffvhuff decoder/encoder depend on the huffyuv decoder/encoder Conflicts: configure libavcodec/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Let the ffvhuff decoder/encoder depend on the huffyuv decoder/encoderDiego Biurrun2014-02-284-8/+2
| | | | | | | | | | Almost all of the code is shared so there is little point in enabling one decoder/encoder without the other.
* | Merge commit '34150be515cd9c43b0b679806b8d01774960af78'Michael Niedermayer2014-03-012-2/+1
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '34150be515cd9c43b0b679806b8d01774960af78': build: Let the iac decoder depend on the imc decoder Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Let the iac decoder depend on the imc decoderDiego Biurrun2014-02-282-2/+1
| | | | | | | | | | Almost all of the code is shared so there is little point in enabling one decoder without the other.
* | Merge commit '8e0cf39faf02536dca08f4fe628a66d1ae022fde'Michael Niedermayer2014-03-012-11/+9
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '8e0cf39faf02536dca08f4fe628a66d1ae022fde': build: Let all MJPEG-related decoders depend on the MJPEG decoder Conflicts: configure libavcodec/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Let all MJPEG-related decoders depend on the MJPEG decoderDiego Biurrun2014-02-282-11/+9
| | | | | | | | | | | | These codecs compile all of the MJPEG code anyway, so there is little point in not enabling the MJPEG decoder directly. This also simplifies the dependency declarations for the MJPEG codec family.
* | Merge commit '0a36988e48dd581d29e77f768f987738bdf365f0'Michael Niedermayer2014-03-012-2/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '0a36988e48dd581d29e77f768f987738bdf365f0': build: Let AMV decoder depend on the SP5X decoder Conflicts: configure libavcodec/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Let AMV decoder depend on the SP5X decoderDiego Biurrun2014-02-282-2/+1
| | | | | | | | | | | | This codec compiles all of the SP5X code anyway, so there is little point in not enabling the decoder directly. This also simplifies the dependency declaration for the AMV decoder.
* | Merge commit 'f4bd9fe326ad1315a74206939ae56df93b940a09'Michael Niedermayer2014-03-011-1/+1
|\ \ | |/ | | | | | | | | | | * commit 'f4bd9fe326ad1315a74206939ae56df93b940a09': h264: fix clang warning about uninitialized variable Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: fix clang warning about uninitialized variableVittorio Giovara2014-02-281-1/+1
| |
* | Merge commit '17a63ff0cd187b9e50e4a47862750295976853b1'Michael Niedermayer2014-03-011-6/+7
|\ \ | |/ | | | | | | | | | | * commit '17a63ff0cd187b9e50e4a47862750295976853b1': h264: update flag name in ff_h264_decode_ref_pic_list_reordering() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: update flag name in ff_h264_decode_ref_pic_list_reordering()Vittorio Giovara2014-02-281-6/+7
| | | | | | | | This is the name used in the specifications.
* | Merge commit 'ee6280ca12696a67535ce2245c77190edc513794'Michael Niedermayer2014-03-011-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'ee6280ca12696a67535ce2245c77190edc513794': h264: parse two additional constraint flags Conflicts: libavcodec/h264_ps.c See: 9091ba9dfa0901bdce8305cf282c747b0f4c942e Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: parse two additional constraint flagsVittorio Giovara2014-02-281-1/+3
| |
* | Merge commit 'e70ab7c1f5005041bba0e4efc1165410f83495b2'Michael Niedermayer2014-03-011-5/+11
|\ \ | |/ | | | | | | | | | | * commit 'e70ab7c1f5005041bba0e4efc1165410f83495b2': h264: add MVCD to the list of High profiles in SPS Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: add MVCD to the list of High profiles in SPSVittorio Giovara2014-02-281-5/+11
| | | | | | | | Also comment all previous profiles.
* | update for 2.2Michael Niedermayer2014-03-013-1/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/utvideoenc: fix slice_bits sizeMichael Niedermayer2014-03-011-2/+2
| | | | | | | | | | | | Fixes assertion failure Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/ac3dec: Use avpriv_ac3_parse_header2()Michael Niedermayer2014-03-011-8/+9
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/ac3_parser: add avpriv_ac3_parse_header2() and use it in libavcodecMichael Niedermayer2014-03-013-6/+25
| | | | | | | | | | | | | | The new function has the ability to allocate the structure, allowing it to grow without needing major bumps Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/ac3: move new field to the end of AC3HeaderInfoMichael Niedermayer2014-03-011-0/+5
| | | | | | | | | | | | | | This structure is used in the interface between libs and thus cannot have fields added in the middle without major bump Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/opt: allow max=min=0 for pixel formatsMichael Niedermayer2014-03-011-0/+6
| | | | | | | | | | | | This is neccessary for maintaining ABI compatibility with FFmpeg 2.1 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
OpenPOWER on IntegriCloud