RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-27 09:52:17 +00:00
Code Issues Projects Releases Wiki Activity
54,224 Commits 37 Branches 400 Tags 245 MiB
a334b00cf6
Commit Graph

54224 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Khirnov
720a1de52f lavc: free the padded last frame during audio encoding properly 2013-06-20 16:49:11 +02:00
Michael Niedermayer
c605adbf56 avformat/libmodplug: Reduce the probe score for small input 
This ensures that theres enough data for mpeg_probe() to recognize mpeg-ps
Fixes Ticket2583

Based on code by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-20 14:58:50 +02:00
Andrey Utkin
2d70f11ef5 Document "sctp" protocol 
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-20 14:56:40 +02:00
Anton Khirnov
eeeb5c291d vsrc_movie: do not free avoption variables in uninit() 
The generic code frees them as well. Since av_free was used to free them
instead of av_freep, this would result in a double free.
 2013-06-20 13:27:14 +02:00
Michael Niedermayer
99dc90ea59 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  configure: Remove unneeded icl inline compatibility definition

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-20 10:29:10 +02:00
Andrey Utkin
f9739a34ad Document "crypto" protocol 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-20 03:01:22 +02:00
Timothy Gu
c16496c377 doc/decoders: Document libgsm decoder 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-20 02:45:18 +02:00
Michael Niedermayer
37baeccef4 Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Autodetect idcin only if audio properties allow decoding.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-19 22:13:35 +02:00
Jean Delvare
b08cd2fb94 delogo: Fix function description 
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>
 2013-06-19 22:13:12 +02:00
Carl Eugen Hoyos
06bede95fc Autodetect idcin only if audio properties allow decoding. 
Fixes ticket #2688.
 2013-06-19 17:07:44 +02:00
Compn
4110828e15 isom: add xd51 hdcam , someone needs to binary search FCP for new isom... 2013-06-19 10:43:48 -04:00
Michael Niedermayer
ddefb80c95 sonicenc: fix off by 1 error 
Fixes out of array accesses

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-19 10:06:38 +02:00
Michael Niedermayer
694c2d1ab3 sonicenc: dont put multiple assignments per line 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-19 10:06:10 +02:00
Alex Smith
e0d6e2fc67 configure: Remove unneeded icl inline compatibility definition 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-06-19 10:53:27 +03:00
Michael Niedermayer
6df61c3ae0 sonicenc: set supported samples formats array 
This ensures that only supported formats are input

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-19 09:50:01 +02:00
Michael Niedermayer
209cb8afe0 Merge remote-tracking branch 'qatar/master' 
* 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>
 2013-06-19 08:27:35 +02:00
Timothy Gu
9ead06057a doc/encoders: Add libopencore-amrnb doc 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-19 01:42:55 +02:00
Michael Niedermayer
602d0bfe67 Merge branch 'frame_num_offset' of https://github.com/mjmvisser/FFmpeg 
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-19 01:25:50 +02:00
Mark Visser
2090abcc43 add the start_number offset to var_values[VAR_N] directly, instead of adding it in func_frame_num 2013-06-18 17:38:17 -04:00
Michael Niedermayer
f8ca8138f0 ff_gen_search: fix infinite loop 
Fixes Ticket2639

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-18 22:53:00 +02:00
Michael Niedermayer
b3dd50cd0d ff_gen_search: fix limit 
The limit value could become slightly wrong in the last iteration

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-18 20:49:37 +02:00
Michael Niedermayer
9d73e30253 ff_gen_search: make step 64it to prevent hypothetical integer overflow 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-18 20:47:07 +02:00
Timothy Gu
e358044922 doc/decoders: Document libcelt 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-18 18:03:22 +02:00
Matthew Heaney
59b13750d2 Add maintainer for WebVTT demuxer and muxer 
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>
 2013-06-18 18:02:30 +02:00
Michael Niedermayer
9626d0e906 avutil/frame: Try to align width to achive linesize[0] alignment 
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>
 2013-06-18 16:50:07 +02:00
Anton Khirnov
c9c7bc4493 lavfi: switch ff_default_get_audio_buffer() to av_frame_get_buffer() 
This simplifies the code and avoids using libavcodec-specific
avcodec_fill_audio_frame().
 2013-06-18 11:21:16 +02:00
Michael Niedermayer
e41bf19d2c Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavfi: math typo in interlace filter

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-18 09:31:05 +02:00
Michael Niedermayer
ca2818b881 swresample/x86/audio_convert: add emms to CONV 
Might fix Ticket1874

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-18 02:26:36 +02:00
Janne Grunau
2ee380aefb vaapi: return early from ff_vaapi_render_picture() without picture 
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>
 2013-06-18 01:56:06 +02:00
Carl Eugen Hoyos
28bf0d94aa Revert "vaapi: return early from ff_vaapi_render_picture() without picture" 
This reverts commit 4cbf245f2a2cd2170ca30b0788c2af5b506fe6d6.

I messed up the author information.
 2013-06-18 01:54:30 +02:00
Carl Eugen Hoyos
3cbf245f2a vaapi: return early from ff_vaapi_render_picture() without picture 
Fixes an assertion when called on uninitialized frame. Spotted after
seeking in vlc.
Fixes ticket #2461.

Tested-by: Timo
Reviewed-by: Joakim Plate
 2013-06-18 00:21:09 +02:00
Alexander Strasser
ac604e446b lavfi/src_movie: Use movie_common_init instead individual wrappers 
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>
 2013-06-18 00:02:30 +02:00
Alexander Strasser
c679a1c358 lavfi/src_movie: Check pointer is not NULL before deref 
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>
 2013-06-18 00:02:30 +02:00
Matthew Heaney
b24f15c45e lavf: add WebVTT muxer. 
This revision creates a WebVTT muxer, that outputs files having the
format described in the following specification:

http://dev.w3.org/html5/webvtt/
 2013-06-17 22:28:19 +02:00
Michael Niedermayer
b4579a29c7 mmsh: dont close context on seeking failure 
Fixes Ticket2581

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-17 22:03:36 +02:00
Michael Niedermayer
c7755c348b mmsh/mmsh_close: use ffurl_closep() 
avoid using freed pointers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-17 21:34:52 +02:00
Michael Niedermayer
0329345da2 mmsh/mmsh_close: use av_freep() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-17 21:33:12 +02:00
Michael Niedermayer
582f53349e jpeg2000dec: make cblk->length(inc)/data use consistent 
Fixes Ticket2612

Reviewed-by: Nicolas BERTRAND <nicoinattendu@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-17 20:08:51 +02:00
Clément Bœsch
de12b454f2 lavf/http: remove Mozilla/5.0 from user agent. 
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.
 2013-06-17 17:06:11 +02:00
Vittorio Giovara
cd0faeee62 lavfi: math typo in interlace filter 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-06-17 12:25:43 +02:00
Marton Balint
96b33ddbd0 ffplay: remove remains of the old audio and video clock VideoState variables 
The unified clock state holds this information now.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-06-17 01:18:07 +02:00
Marton Balint
05f0d53170 ffplay: fix missed conversion of video_current_pts to vidclk.pts in subtitles 
Fixes regression with subtitles introduced in f2175a6.
Fixes ticket #2666.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-06-17 01:18:07 +02:00
Marton Balint
f73d6d2af7 ffplay: cast vp->height to int64 in buffer size check 
Fixes Coverity CID 1026769 and 1026756.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-06-17 01:18:07 +02:00
Michael Niedermayer
95275551ef Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  smacker: check frame size validity

Conflicts:
	libavformat/smacker.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-17 01:04:33 +02:00
Michael Niedermayer
e99f324c14 Merge commit '58c95448e42d34910b939363949ba1a92c06b0b0' 
* commit '58c95448e42d34910b939363949ba1a92c06b0b0':
  smacker: pad the extradata allocation

Conflicts:
	libavformat/smacker.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-17 00:44:32 +02:00
Michael Niedermayer
6c655b40ea Merge commit 'bbb2945f2dfbc2306c1655bf7eb6e220912a9a7c' 
* commit 'bbb2945f2dfbc2306c1655bf7eb6e220912a9a7c':
  smacker: check the return value of smacker_decode_tree

Conflicts:
	libavcodec/smacker.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-17 00:36:25 +02:00
Michael Niedermayer
85a3d20da5 Merge commit 'f52edef30197735bfb937e9e723ab1e7b31165c6' 
* commit 'f52edef30197735bfb937e9e723ab1e7b31165c6':
  smacker: fix an off by one in huff.length computation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-17 00:34:07 +02:00
Michael Niedermayer
a4a2e894fc Merge commit '985f34b75653d02eda8eb8def3412f8577f19b01' 
* commit '985f34b75653d02eda8eb8def3412f8577f19b01':
  utils: fix avcodec_flush_buffers pre-reference counting compatibility

Conflicts:
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-17 00:21:22 +02:00
Michael Niedermayer
1f87cbe834 Merge commit 'df9f22d42b0905385629a9d368bb5a1eef2b45ef' 
* commit 'df9f22d42b0905385629a9d368bb5a1eef2b45ef':
  avf: move url utility functions in a separate file

Conflicts:
	libavformat/internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-17 00:09:31 +02:00
Michael Niedermayer
8097307bfb Merge commit '12db891dcd57b305d6e3c1e22ea8204dc26edda1' 
* commit '12db891dcd57b305d6e3c1e22ea8204dc26edda1':
  avf: move ff_write_chained to mux.c

Conflicts:
	libavformat/mux.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-16 23:58:59 +02:00