summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* Merge commit '32d05934abc7427bb90380a4c1ab20a15fd7d821'Michael Niedermayer2014-04-18
|\ | | | | | | | | | | | | | | | | | | * commit '32d05934abc7427bb90380a4c1ab20a15fd7d821': mp3dec: decode more data from Info header Conflicts: libavformat/mp3dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mp3dec: decode more data from Info headerAlessandro Ghedini2014-04-17
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'fbd8e042107ec63e0ddf155588c59dcb76007641'Michael Niedermayer2014-04-17
|\| | | | | | | | | | | | | | | | | | | * commit 'fbd8e042107ec63e0ddf155588c59dcb76007641': mp3dec: move XING/Info and VBRI parsing into their own functions Conflicts: libavformat/mp3dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mp3dec: move XING/Info and VBRI parsing into their own functionsAlessandro Ghedini2014-04-17
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'ae43c10e36197000de2f3cc99ea35727ce98a796'Michael Niedermayer2014-04-17
|\| | | | | | | | | | | | | * commit 'ae43c10e36197000de2f3cc99ea35727ce98a796': replaygain: allow exporting already decoded replaygain values Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * replaygain: allow exporting already decoded replaygain valuesAlessandro Ghedini2014-04-17
| | | | | | | | | | | | | | | | This adds a function to export raw replaygain values (i.e. in the (u)int32_t form). It first checks whether AV_PKT_DATA_REPLAYGAIN side data is present, in which case it does nothing. Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * rtmpproto: Handle RTMP chunk size packets before the connect packetStephan Soller2014-04-14
| | | | | | | | | | | | | | | | | | | | | | | | | | In all other cases where ff_rtmp_packet_read is used, the packet returned is passed to rtmp_parse_result more or less immediately. In this single case, the content of the packet was required to be a connect packet. Some clients, e.g. Open Broadcaster Software, send a chunk size packet before the connect packet. If the first packet is a chunk size packet, handle it and read another one, requiring this to be a connect packet instead. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Write sample_aspect_ratio to asf files.Carl Eugen Hoyos2014-04-17
| | | | | | | | Fixes ticket #3528.
* | Only insert the icpf atom in ProRes mkv packets if it isn't already present.Carl Eugen Hoyos2014-04-17
| | | | | | | | | | | | The patch allows to read broken mkv files containing ProRes as written by the Haali muxer. Fixes a part of ticket #3434.
* | Fix compilation with --disable-everything --enable-muxer=avi --disable-network.Anh2014-04-16
| | | | | | | | Fixes ticket #3568.
* | avformat/ico: use avmalloc(z)_array()Michael Niedermayer2014-04-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegenc: try to improve the VBV buffer warningMichael Niedermayer2014-04-16
| | | | | | | | | | | | Maybe fixes Ticket 3494 Part of the message suggested by: rogerdpack Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: Remove redundant checkMichael Niedermayer2014-04-16
| | | | | | | | | | | | Fixes part of Ticket3466 Found-by: Andrey_Karpov / PVS-Studio Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/hnm: fix decoding of 256x256 videoMichael Niedermayer2014-04-16
| | | | | | | | | | Fixes Ticket3464 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/flacdec/flac_read_timestamp: free the correct packetMichael Niedermayer2014-04-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/flacdec/flac_read_timestamp: dont modify AVStream stateMichael Niedermayer2014-04-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/xmv: use av_malloc_array()Michael Niedermayer2014-04-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegtsenc: use av_malloc_array()Michael Niedermayer2014-04-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: fix typoMichael Niedermayer2014-04-15
| | | | | | | | | | Found-by: reimar Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: add av_format_inject_global_side_data(), and disable it by defaultMichael Niedermayer2014-04-15
| | | | | | | | | | | | | | | | | | | | After this commit applications needs to call av_format_inject_global_side_data() or handle AVStream side data by some other means if they want it not to be lost. This fixes a API incompatibility with libav. libav API does not allow the data to be passed through AVPackets Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/img2dec: fix typoMichael Niedermayer2014-04-14
| | | | | | | | | | Found-by: Reimar Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge branch 'flac' of https://github.com/FernetMenta/FFmpegMichael Niedermayer2014-04-14
|\ \ | | | | | | | | | Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | flac demuxer: improve seekingRainer Hochecker2014-04-14
| | |
* | | Fix writing RGB 5:5:5 rawvideo into avi.Carl Eugen Hoyos2014-04-14
| | | | | | | | | | | | WMP expects bits per pixel to be set to 16 for RGB 5:5:5 rawvideo.
* | | avformat/rtmpproto: Added handling of an initial RTMP chunk size packet.Stephan Soller2014-04-14
| | | | | | | | | | | | | | | | | | | | | Fixes ticket #2911. Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Merge commit '6477139721f559b26eafd415e23e13ea2b0c27e1'Michael Niedermayer2014-04-14
|\ \ \ | | |/ | |/| | | | | | | | | | | | | * commit '6477139721f559b26eafd415e23e13ea2b0c27e1': rtmpproto: Make sure to pass on the error code if read_connect failed Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | rtmpproto: Make sure to pass on the error code if read_connect failedMartin Storsjö2014-04-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, if read_connect failed, the ret variable was unmodified and had the value 0, indicating success, which then was returned from the rtmp_open function, even though it actually failed. CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | | avformat/network: use av_malloc_array()Michael Niedermayer2014-04-13
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avformat/mp3enc: drop redundant and uninitialized variableMichael Niedermayer2014-04-13
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avformat/utils: reinject global side data on seeksMichael Niedermayer2014-04-13
| | | | | | | | | | | | | | | | | | This fixes ffplay replaygain with seeking Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avformat/utils: factorize if()Michael Niedermayer2014-04-13
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avformat/utils: Inject global side data into first packet.Michael Niedermayer2014-04-13
| | | | | | | | | | | | | | | | | | This fixes replaygain handling in ffplay and probably other applications. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avformat/iff: indentPeter Ross2014-04-13
| | | | | | | | | | | | | | | Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avformat/iff: remove unused codePeter Ross2014-04-13
| | | | | | | | | | | | | | | | | | | | | bits_per_coded_sample and block_align are calculated again at end of if() block Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Merge commit '617a1a98a6be3e59db6fbfc21afab2fb9a049c03'Michael Niedermayer2014-04-12
|\| | | |/ |/| | | | | | | | | | | | | | | | | | | | | * commit '617a1a98a6be3e59db6fbfc21afab2fb9a049c03': mp3enc: Properly write bitrate value in XING header Conflicts: libavformat/mp3enc.c See: 40176fc3149bc72c1309f93989a57aec2322e626 See: d62bf5d4e73250295c0a652e151498c5b19cbd63 See: various others Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mp3enc: Properly write bitrate value in XING headerMichael Niedermayer2014-04-12
| | | | | | | | | | | | | | | | | | | | | | | | Instead of using a fixed bitrate_idx, calculate a matching bitrate for the XING header. Using a fixed bitrate_idx causes tools such as file(1) and mediainfo(1) to report wrong bitrate and bitrate mode when using CBR. Bug-Id: https://bugs.debian.org/736088 Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | avformat/img2dec: support nanosecond file timesMichael Niedermayer2014-04-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/hls: reduce memory usage by using dynamically allocated url/keyMichael Schenk2014-04-12
| | | | | | | | Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
* | Improve amr bitrate calculation for VBR files.Carl Eugen Hoyos2014-04-11
| | | | | | | | Fixes ticket #3541.
* | Warn if rawvideo and an unreadable pix_fmt are written.Carl Eugen Hoyos2014-04-11
| | | | | | | | | | | | Print an error if a combination of rawvideo and an unusual pix_fmt that will be impossible to decode are written to avi or mov. Fixes ticket #3545.
* | lavd: add device capabilities APILukasz Marek2014-04-11
| | | | | | | | | | | | | | Provides API to query device capabilities. Each device must implement callbacks to benefit from this API. Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
* | avformat/hls: do not call ffurl_seek/ffurl_size on crypto protocolAnssi Hannula2014-04-11
| | | | | | | | | | | | | | | | | | | | ffurl_seek() will not work even when it should be a no-op, so do not call it on crypto protocol. Also replace use of ffurl_size() for the same reason. Reported-by: Michael Schenk <Michael.Schenk@albistechnologies.com> Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
* | lavf/rtspcodes: add missing header includeJames Almer2014-04-10
| | | | | | | | | | | | | | Fixes make checkheaders Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: merge mov_read_custom_metadata() and mov_read_custom()Michael Niedermayer2014-04-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '9a07fac678a8540d076e635061bbaa4ed09a9431'Michael Niedermayer2014-04-10
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '9a07fac678a8540d076e635061bbaa4ed09a9431': mov: read hydrogenaudio replaygain information Conflicts: libavformat/Makefile libavformat/mov.c See: 37a15f3e669372075c88254e070c971aecb485aa Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: read hydrogenaudio replaygain informationAnton Khirnov2014-04-10
| |
| * rawvideo: Support decoding YVYU422 FourCCVittorio Giovara2014-04-08
| |
* | lavf/utils: fix mem leakLukasz Marek2014-04-10
| | | | | | | | | | | | | | | | | | Calling avformat_free_context() right after avformat_alloc_output_context2() leaved option's default values not freed. Options were freed only in av_write_trailer(). Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2014-04-10
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | * cehoyos/master: Fix a typo in amr.c. Remove an unneeded include of avassert.h from amr.c. Do not allow writing invalid wav channel layouts by default. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | Fix a typo in amr.c.Carl Eugen Hoyos2014-04-09
| | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-29 17:19:24 +0000