summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '6d97484d72e33f7dde9493a9ead1a72e2f029605'Michael Niedermayer2013-03-141-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6d97484d72e33f7dde9493a9ead1a72e2f029605': avcodec: av_log_ask_for_sample() ---> avpriv_request_sample() rsodec: Use avpriv_report_missing_feature() where appropriate Conflicts: libavcodec/anm.c libavcodec/mlpdec.c libavcodec/pictordec.c libavcodec/sunrast.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rsodec: Use avpriv_report_missing_feature() where appropriateDiego Biurrun2013-03-131-1/+1
| |
* | Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e'Michael Niedermayer2013-03-1418-37/+39
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e': avformat: av_log_ask_for_sample() ---> avpriv_request_sample() Conflicts: libavformat/mxfdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: av_log_ask_for_sample() ---> avpriv_request_sample()Diego Biurrun2013-03-1318-38/+38
| |
* | Merge commit '63d744e2be39466e3a734c2987cd713e0bac101e'Michael Niedermayer2013-03-143-4/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit '63d744e2be39466e3a734c2987cd713e0bac101e': av_log_missing_feature() ---> avpriv_report_missing_feature() Conflicts: libavcodec/aacdec.c libavcodec/tta.c libavformat/mpegts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * av_log_missing_feature() ---> avpriv_report_missing_feature()Diego Biurrun2013-03-133-4/+4
| |
| * matroskadec: request a read buffer for the wav headerLuca Barbato2013-03-121-1/+1
| | | | | | | | | | | | Solve an infiniloop. CC: libav-stable@libav.org
* | Merge commit 'a4472ac01e86f9fae5adb9034f2777b86a9c5480'Michael Niedermayer2013-03-133-10/+8
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'a4472ac01e86f9fae5adb9034f2777b86a9c5480': Add informative messages to av_log_ask_for_sample calls lacking them anm: Get rid of some very silly goto statements Conflicts: libavformat/anm.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add informative messages to av_log_ask_for_sample calls lacking themDiego Biurrun2013-03-123-7/+4
| |
| * anm: Get rid of some very silly goto statementsDiego Biurrun2013-03-121-10/+5
| |
* | Merge commit '85a5bc054c1290699ccbf5799ba6c4e2fbcc3530'Michael Niedermayer2013-03-131-1/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '85a5bc054c1290699ccbf5799ba6c4e2fbcc3530': lavf: remove disabled FF_API_R_FRAME_RATE cruft Conflicts: libavformat/avformat.h libavformat/electronicarts.c libavformat/rawdec.c libavformat/utils.c libavformat/version.h The field is in use and no semantically equivalent field is available, thus not removed Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: remove disabled FF_API_R_FRAME_RATE cruftAnton Khirnov2013-03-1112-110/+0
| |
* | avformat: postpone API removials where the functions are trivial wrapersMichael Niedermayer2013-03-131-4/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '7b486ab13bfcfa88a7cd92586de50e49966ec292'Michael Niedermayer2013-03-134-36/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '7b486ab13bfcfa88a7cd92586de50e49966ec292': lavf: remove disabled FF_API_AV_GETTIME cruft lavf: remove disabled FF_API_INTERLEAVE_PACKET cruft Conflicts: libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: remove disabled FF_API_AV_GETTIME cruftAnton Khirnov2013-03-113-14/+0
| |
| * lavf: remove disabled FF_API_INTERLEAVE_PACKET cruftAnton Khirnov2013-03-113-22/+0
| |
* | Merge commit '435c2a31ad5eead20eda1152097f60c3bfa22847'Michael Niedermayer2013-03-131-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit '435c2a31ad5eead20eda1152097f60c3bfa22847': lavf: remove disabled FF_API_READ_PACKET cruft Conflicts: libavformat/version.h Removial postponed as wraper is trivial Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: remove disabled FF_API_READ_PACKET cruftAnton Khirnov2013-03-113-29/+0
| |
* | Merge commit 'c7e044c61bb08b3a6e1e8063e8f4449c88b01201'Michael Niedermayer2013-03-133-30/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'c7e044c61bb08b3a6e1e8063e8f4449c88b01201': lavf: remove disabled FF_API_APPLEHTTP_PROTO cruft Conflicts: libavformat/allformats.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: remove disabled FF_API_APPLEHTTP_PROTO cruftAnton Khirnov2013-03-113-30/+0
| |
* | Merge commit '0a7c4daf469d4ac447fb822fe78337f62f4c04e6'Michael Niedermayer2013-03-131-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit '0a7c4daf469d4ac447fb822fe78337f62f4c04e6': lavf: remove disabled FF_API_CLOSE_INPUT_FILE cruft Conflicts: libavformat/version.h removial postponed as the wraper code is trivial Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: remove disabled FF_API_CLOSE_INPUT_FILE cruftAnton Khirnov2013-03-113-21/+0
| |
| * output-example: Update to use encode_video2 instead of the now dropped ↵Martin Storsjö2013-03-081-28/+15
| | | | | | | | | | | | encode_video Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | avutil/os_support: use 64-bit fstat/lseek variants for MSVC as wellHendrik Leppkes2013-03-122-1/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: add AV_ to two remaining CODEC_ID_*.Nicolas George2013-03-122-2/+2
| |
* | Merge commit '3e2f200237af977b9253b0aff121eee27bcedb44'Michael Niedermayer2013-03-121-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '3e2f200237af977b9253b0aff121eee27bcedb44': roqvideodec: fix a potential infinite loop in roqvideo_decode_frame(). xxan: fix invalid memory access in xan_decode_frame_type0() tty: set avg_frame_rate. FATE: enable multiple slices in the ffv1 vsynth test Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tty: set avg_frame_rate.Anton Khirnov2013-03-081-0/+1
| | | | | | | | The container does not store any timestamps and is CFR-only.
* | Merge commit '7b89cd20d844cbe763ca34e63e99d110043cf241'Michael Niedermayer2013-03-121-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit '7b89cd20d844cbe763ca34e63e99d110043cf241': eamad: allocate a dummy reference frame when the real one is missing Replace remaining includes of audioconvert.h with channel_layout.h Replace some forgotten instances of PIX_FMT_* with AV_PIX_FMT_*. Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace remaining includes of audioconvert.h with channel_layout.hAnton Khirnov2013-03-081-1/+1
| |
* | Merge commit 'd8b31be6caebd8d1321ecb754b6e7daaf81dc111'Michael Niedermayer2013-03-121-4/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd8b31be6caebd8d1321ecb754b6e7daaf81dc111': Add the bumps and APIchanges entries for reference counted buffers changes. Conflicts: Changelog doc/APIchanges libavcodec/version.h libavdevice/version.h libavfilter/version.h libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add the bumps and APIchanges entries for reference counted buffers changes.Anton Khirnov2013-03-081-3/+3
| |
* | avformat: keep r_frame_rateMichael Niedermayer2013-03-122-11/+22
| | | | | | | | | | | | This field is used and nothing equivalent exists Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/avdevice: add missing time.h includesMichael Niedermayer2013-03-122-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegts: clear avprograms only for removed programsMichael Niedermayer2013-03-101-3/+11
| | | | | | | | | | | | | | Fixes Ticket2186 Requested-by: carl Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '1afddbe59e96af75f1c07605afc95615569f388f'Michael Niedermayer2013-03-0818-78/+117
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1afddbe59e96af75f1c07605afc95615569f388f': avpacket: use AVBuffer to allow refcounting the packets. Conflicts: libavcodec/avpacket.c libavcodec/utils.c libavdevice/v4l2.c libavformat/avidec.c libavformat/flacdec.c libavformat/id3v2.c libavformat/matroskaenc.c libavformat/mux.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avpacket: use AVBuffer to allow refcounting the packets.Anton Khirnov2013-03-0817-74/+112
| | | | | | | | | | | | This will allow us to avoid copying the packets in many cases. This breaks ABI.
| * mp3dec: Fix VBR bit rate parsingAlexander Kojevnikov2013-03-081-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | When parsing the Xing/Info tag, don't set the bit rate if it's an Info tag. When parsing the stream, don't override the bit rate if it's already set, otherwise calculate the mean bit rate from parsed frames. This way, the bit rate will be set correctly both for CBR and VBR streams. CC:libav-stable@libav.org Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * Use the avstring.h locale-independent character type functionsReimar Döffinger2013-03-078-17/+15
| | | | | | | | | | | | Make sure the behavior does not change with the locale. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat: Fix apics with aacMichael Niedermayer2013-03-071-1/+1
| | | | | | | | | | | | Fixes Ticket2318 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | hls: fix timebaseMichael Niedermayer2013-03-071-0/+2
| | | | | | | | | | | | Fixes Ticket1733 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/segment: add support to ffconcat segment listStefano Sabatini2013-03-072-4/+22
| |
* | asfdec: dont truncate type 2-5 valuesMichael Niedermayer2013-03-051-3/+4
| | | | | | | | | | | | | | Fixes use of uninitialized variables and possible out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/concat: compute duration if possible.Nicolas George2013-03-051-0/+13
| |
* | Revert "lavf/concatdec: define "ffcat" and "ffconcat" extensions"Nicolas George2013-03-052-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6cc12353a88dfb21c4c5a38e6c83280483b0ec88. Conflicts: libavformat/version.h Allowing to automatically select the concat demuxer raises security concerns, as it allows a possibly hostile file to access any file on the system. Guessing the format based on the file name extension does not allow to enable the safe mode designed to avoid it.
* | mp3dec: Fix VBR bit rate parsingAlexander Kojevnikov2013-03-051-2/+4
| | | | | | | | | | | | | | | | | | | | | | When parsing the Xing/Info tag, don't set the bit rate if it's an Info tag. When parsing the stream, don't override the bit rate if it's already set, otherwise calculate the mean bit rate from parsed frames. This way, the bit rate will be set correctly both for CBR and VBR streams. Signed-off-by: Alexander Kojevnikov <alexander@kojevnikov.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | iff: fix integer overflowMichael Niedermayer2013-03-051-0/+3
| | | | | | | | | | | | | | Fixes out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | update_stream_timings: check bitrate for being in range.Michael Niedermayer2013-03-041-1/+3
| | | | | | | | | | | | | | Fixes numerical overflow Fixes Ticket2089 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: Make duration estimation from pts more robustMichael Niedermayer2013-03-042-1/+5
| | | | | | | | | | | | | | Ignore durations which differ significantly from the previous Fixes Ticket2018 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | nutdec: more specific return codes for decode_syncpoint()Michael Niedermayer2013-03-041-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | nutdec: print error on invalid/unsupported fourcc styleMichael Niedermayer2013-03-041-1/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
View Lorry Controller Status