summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2013-06-19
|\ | | | | | | | | | | | | * cehoyos/master: Autodetect idcin only if audio properties allow decoding. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Autodetect idcin only if audio properties allow decoding.Carl Eugen Hoyos2013-06-19
| | | | | | | | Fixes ticket #2688.
* | delogo: Fix function descriptionJean Delvare2013-06-19
|/ | | | | | | | The algorithm works on src and writes to dst, not the other way around. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* isom: add xd51 hdcam , someone needs to binary search FCP for new isom...Compn2013-06-19
|
* sonicenc: fix off by 1 errorMichael Niedermayer2013-06-19
| | | | | | Fixes out of array accesses Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* sonicenc: dont put multiple assignments per lineMichael Niedermayer2013-06-19
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* sonicenc: set supported samples formats arrayMichael Niedermayer2013-06-19
| | | | | | This ensures that only supported formats are input Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-06-19
|\ | | | | | | | | | | | | | | | | | | * qatar/master: lavfi: switch ff_default_get_audio_buffer() to av_frame_get_buffer() Conflicts: libavfilter/audio.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavfi: switch ff_default_get_audio_buffer() to av_frame_get_buffer()Anton Khirnov2013-06-18
| | | | | | | | | | This simplifies the code and avoids using libavcodec-specific avcodec_fill_audio_frame().
* | doc/encoders: Add libopencore-amrnb docTimothy Gu2013-06-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge branch 'frame_num_offset' of https://github.com/mjmvisser/FFmpegMichael Niedermayer2013-06-19
|\ \ | | | | | | | | | Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | add the start_number offset to var_values[VAR_N] directly, instead of adding ↵Mark Visser2013-06-18
| | | | | | | | | | | | it in func_frame_num
| * | added start_number parameter to drawtext to permit an offset to n/frame_num varMark Visser2013-06-14
| | |
* | | ff_gen_search: fix infinite loopMichael Niedermayer2013-06-18
| | | | | | | | | | | | | | | | | | Fixes Ticket2639 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | ff_gen_search: fix limitMichael Niedermayer2013-06-18
| | | | | | | | | | | | | | | | | | The limit value could become slightly wrong in the last iteration Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | ff_gen_search: make step 64it to prevent hypothetical integer overflowMichael Niedermayer2013-06-18
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | doc/decoders: Document libceltTimothy Gu2013-06-18
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Add maintainer for WebVTT demuxer and muxerMatthew Heaney2013-06-18
| | | | | | | | | | | | | | | | | | | | | Matthew J Heaney is added to the list of ffmpeg maintainers, for the WebVTT demuxer and muxer. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avutil/frame: Try to align width to achive linesize[0] alignmentMichael Niedermayer2013-06-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | This results in more alignment for pixel formats that have "odd" pixel sizes like RGB24. It makes access through SIMD easier Works around Issue described in Ticket1031 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-06-18
|\ \ \ | | |/ | |/| | | | | | | | | | | | | * qatar/master: lavfi: math typo in interlace filter Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | lavfi: math typo in interlace filterVittorio Giovara2013-06-17
| | | | | | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | | swresample/x86/audio_convert: add emms to CONVMichael Niedermayer2013-06-18
| | | | | | | | | | | | | | | | | | Might fix Ticket1874 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | vaapi: return early from ff_vaapi_render_picture() without pictureJanne Grunau2013-06-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes an assertion when called on uninitialized frame. Spotted after seeking in vlc. Fixes ticket #2461. Tested-by: Timo Reviewed-by: Joakim Plate Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
* | | Revert "vaapi: return early from ff_vaapi_render_picture() without picture"Carl Eugen Hoyos2013-06-18
| | | | | | | | | | | | | | | | | | This reverts commit 4cbf245f2a2cd2170ca30b0788c2af5b506fe6d6. I messed up the author information.
* | | vaapi: return early from ff_vaapi_render_picture() without pictureCarl Eugen Hoyos2013-06-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes an assertion when called on uninitialized frame. Spotted after seeking in vlc. Fixes ticket #2461. Tested-by: Timo Reviewed-by: Joakim Plate
* | | lavfi/src_movie: Use movie_common_init instead individual wrappersAlexander Strasser2013-06-18
| | | | | | | | | | | | | | | | | | | | | Makes it easier to understand that there is no difference in init callback for movie and amovie. Also saves a few lines of code. Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
* | | lavfi/src_movie: Check pointer is not NULL before derefAlexander Strasser2013-06-18
| | | | | | | | | | | | | | | | | | | | | Also do not check against empty string, the lower levels should be able to deal with it. Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
* | | lavf: add WebVTT muxer.Matthew Heaney2013-06-17
| | | | | | | | | | | | | | | | | | | | | This revision creates a WebVTT muxer, that outputs files having the format described in the following specification: http://dev.w3.org/html5/webvtt/
* | | mmsh: dont close context on seeking failureMichael Niedermayer2013-06-17
| | | | | | | | | | | | | | | | | | Fixes Ticket2581 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | mmsh/mmsh_close: use ffurl_closep()Michael Niedermayer2013-06-17
| | | | | | | | | | | | | | | | | | avoid using freed pointers Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | mmsh/mmsh_close: use av_freep()Michael Niedermayer2013-06-17
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | jpeg2000dec: make cblk->length(inc)/data use consistentMichael Niedermayer2013-06-17
| | | | | | | | | | | | | | | | | | | | | Fixes Ticket2612 Reviewed-by: Nicolas BERTRAND <nicoinattendu@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | lavf/http: remove Mozilla/5.0 from user agent.Clément Bœsch2013-06-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is notably known to break playback on http streaming servers who use the user agent to guess if it's a browser (to display a summary) or a player (to stream the audio data). This reverts 1fabd95. Fixes Ticket #2663.
* | | ffplay: remove remains of the old audio and video clock VideoState variablesMarton Balint2013-06-17
| | | | | | | | | | | | | | | | | | The unified clock state holds this information now. Signed-off-by: Marton Balint <cus@passwd.hu>
* | | ffplay: fix missed conversion of video_current_pts to vidclk.pts in subtitlesMarton Balint2013-06-17
| | | | | | | | | | | | | | | | | | | | | Fixes regression with subtitles introduced in f2175a6. Fixes ticket #2666. Signed-off-by: Marton Balint <cus@passwd.hu>
* | | ffplay: cast vp->height to int64 in buffer size checkMarton Balint2013-06-17
| | | | | | | | | | | | | | | | | | Fixes Coverity CID 1026769 and 1026756. Signed-off-by: Marton Balint <cus@passwd.hu>
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-06-17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: smacker: check frame size validity Conflicts: libavformat/smacker.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | smacker: check frame size validityKostya Shishkov2013-06-16
| | | | | | | | | | | | | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | | Merge commit '58c95448e42d34910b939363949ba1a92c06b0b0'Michael Niedermayer2013-06-17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '58c95448e42d34910b939363949ba1a92c06b0b0': smacker: pad the extradata allocation Conflicts: libavformat/smacker.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | smacker: pad the extradata allocationKostya Shishkov2013-06-16
| | | | | | | | | | | | | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | | Merge commit 'bbb2945f2dfbc2306c1655bf7eb6e220912a9a7c'Michael Niedermayer2013-06-17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bbb2945f2dfbc2306c1655bf7eb6e220912a9a7c': smacker: check the return value of smacker_decode_tree Conflicts: libavcodec/smacker.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | smacker: check the return value of smacker_decode_treeKostya Shishkov2013-06-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | Also prevent a memory leak. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | | Merge commit 'f52edef30197735bfb937e9e723ab1e7b31165c6'Michael Niedermayer2013-06-17
|\| | | | | | | | | | | | | | | | | | | | * commit 'f52edef30197735bfb937e9e723ab1e7b31165c6': smacker: fix an off by one in huff.length computation Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | smacker: fix an off by one in huff.length computationKostya Shishkov2013-06-16
| | | | | | | | | | | | | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | | Merge commit '985f34b75653d02eda8eb8def3412f8577f19b01'Michael Niedermayer2013-06-17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '985f34b75653d02eda8eb8def3412f8577f19b01': utils: fix avcodec_flush_buffers pre-reference counting compatibility Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | utils: fix avcodec_flush_buffers pre-reference counting compatibilityJanne Grunau2013-06-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The to_free AVframe must be freed just like the other ones. Indeed, the calling application may expect all frames to be released. (This regression caused use-after-free in VLC with hwaccel.) Signed-off-by: Rémi Denis-Courmont <remi@remlab.net> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | | Merge commit 'df9f22d42b0905385629a9d368bb5a1eef2b45ef'Michael Niedermayer2013-06-17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'df9f22d42b0905385629a9d368bb5a1eef2b45ef': avf: move url utility functions in a separate file Conflicts: libavformat/internal.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | avf: move url utility functions in a separate fileLuca Barbato2013-06-16
| | |
* | | Merge commit '12db891dcd57b305d6e3c1e22ea8204dc26edda1'Michael Niedermayer2013-06-16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '12db891dcd57b305d6e3c1e22ea8204dc26edda1': avf: move ff_write_chained to mux.c Conflicts: libavformat/mux.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | avf: move ff_write_chained to mux.cLuca Barbato2013-06-16
| | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-21 11:19:20 +0000