virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-12 19:18:44 +02:00
Code Issues Releases Activity
67,290 Commits 37 Branches 400 Tags 463 MiB
7f24e1e1a2
Commit Graph

67290 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Carl Eugen Hoyos
b6e8f10bcb lavf/cinedec: Fix a typo in the file header. 2014-10-22 01:37:02 +02:00
Michael Niedermayer
42316907b8 Merge commit 'af7ca6ea124b82b337a6b96e10963e88eba57ebe' 
* commit 'af7ca6ea124b82b337a6b96e10963e88eba57ebe':
  nutdec: check av_new_packet return value

Conflicts:
	libavformat/nutdec.c

See: bb502411dd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-22 00:26:37 +02:00
Michael Niedermayer
dd3f1563d7 Merge commit 'b69183f65d0f6f4cd7a4e6c0deb57d59b0185aba' 
* commit 'b69183f65d0f6f4cd7a4e6c0deb57d59b0185aba':
  nutenc: check for negative index rather than assert

Conflicts:
	libavformat/nutenc.c

Not merged, the assert is correct

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-22 00:09:00 +02:00
Michael Niedermayer
979062fe2f Merge commit 'be42c0b8d57fe2ea769892d102ffd5561dc18709' 
* commit 'be42c0b8d57fe2ea769892d102ffd5561dc18709':
  rmdec: stricter error check to avoid theoretical unitialized use

Conflicts:
	libavformat/rmdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-21 23:47:44 +02:00
Michael Niedermayer
840bc8e284 Merge commit '7207dd8f829baee58b4df6c97c19ffde77039e8d' 
* commit '7207dd8f829baee58b4df6c97c19ffde77039e8d':
  rmdec: check av_new_packet return value

Conflicts:
	libavformat/rmdec.c

See: c01a462cda
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-21 23:01:26 +02:00
Lukasz Marek
6aa1cfed0b lavd/fbdev_common: report error during probing fbdev device 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-10-21 22:57:32 +02:00
Lukasz Marek
da833a6d09 lavd/fbdev_dec: use default device when not provided 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-10-21 22:57:32 +02:00
Michael Niedermayer
3099008f07 Merge commit '629b2ed0ac77d7c4bf1aeac5e70cafee5fa0fcae' 
* commit '629b2ed0ac77d7c4bf1aeac5e70cafee5fa0fcae':
  flvdec: make sure to check create_stream and report the same error

Conflicts:
	libavformat/flvdec.c

See: d7d5b5dfc1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-21 22:35:30 +02:00
Michael Niedermayer
1922357e5a Merge commit 'f22aa6b841dc54fa1dd804303885b1e230a5f629' 
* commit 'f22aa6b841dc54fa1dd804303885b1e230a5f629':
  flvdec: avoid unitialized use of a struct member

See: 396ddcf22d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-21 22:27:17 +02:00
Michael Niedermayer
4542615063 Merge commit 'e73d26bbd65f1ac5fc73ef3fd24cab1bed8ba2e2' 
* commit 'e73d26bbd65f1ac5fc73ef3fd24cab1bed8ba2e2':
  smoothstreamingenc: explict cast to avoid overflow

Conflicts:
	libavformat/smoothstreamingenc.c

See: b399816d9c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-21 22:00:04 +02:00
Michael Niedermayer
2f74b8d0ed Merge commit '04d8af5f17961b9b7076b8c974e360feb08787c2' 
* commit '04d8af5f17961b9b7076b8c974e360feb08787c2':
  fate-mpeg4: use TARGET_SAMPLES for resize tests

Conflicts:
	tests/fate/mpeg4.mak

See: c40a1bd253
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-21 21:44:48 +02:00
Michael Niedermayer
d5a3a20d1e avcodec/mjpegdec: simplify chroma_height calculation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-21 21:36:17 +02:00
Mika Raento
17702f1fc5 mov.c: reasonable bitrate for fragmented mp4 
If using MFRA for timestamps, the stream may start from a large offset
and/or have gaps. With this change we calculate the bitrate based on
frames we've seen.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-21 18:06:18 +02:00
Michael Niedermayer
059c842818 avcodec/mjpegdec: Support 24111100 pix fmt id 
Fixes 129533924_640.jpg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-21 16:41:47 +02:00
Vittorio Giovara
af7ca6ea12 nutdec: check av_new_packet return value 
CC: libav-stable@libav.org
Bug-Id: CID 733713
 2014-10-21 14:37:48 +01:00
Vittorio Giovara
b69183f65d nutenc: check for negative index rather than assert 
CC: libav-stable@libav.org
Bug-Id: CID 703721
 2014-10-21 14:37:48 +01:00
Vittorio Giovara
be42c0b8d5 rmdec: stricter error check to avoid theoretical unitialized use 
CC: libav-stable@libav.org
Bug-Id: CID 90558
 2014-10-21 14:37:48 +01:00
Vittorio Giovara
7207dd8f82 rmdec: check av_new_packet return value 
CC: libav-stable@libav.org
Bug-Id: CID 733714
 2014-10-21 14:37:48 +01:00
Vittorio Giovara
629b2ed0ac flvdec: make sure to check create_stream and report the same error 
CC: libav-stable@libav.org
Bug-Id: CID 732242
 2014-10-21 14:37:48 +01:00
Vittorio Giovara
f22aa6b841 flvdec: avoid unitialized use of a struct member 
CC: libav-stable@libav.org
Bug-Id: CID 718141
 2014-10-21 14:37:48 +01:00
Vittorio Giovara
e73d26bbd6 smoothstreamingenc: explict cast to avoid overflow 
CC: libav-stable@libav.org
Bug-Id: CID 732248
 2014-10-21 14:37:48 +01:00
Rodger Combs
1372c55786 doc/ffmpeg.texi: document the new -start_at_zero option 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-21 13:38:44 +02:00
Stefano Sabatini
843d7bb3a6 lavfi/concat: accept a single segment 
Simplify scripting operations, so that n=1 is not to be considered as a
special case.
 2014-10-21 13:28:40 +02:00
Stefano Sabatini
7ba2e134fb lavfi/afade: fix cur_sample computation 
Use the correct timebase conversion.
 2014-10-21 13:28:08 +02:00
Thilo Borgmann
6e6b79e7b8 lavf/mov.c: Prevent memory leak in case of invalid metadata reads. 
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-21 12:36:52 +02:00
Janne Grunau
04d8af5f17 fate-mpeg4: use TARGET_SAMPLES for resize tests 2014-10-21 09:57:10 +02:00
Andrey Utkin
282c9354f1 avformat/rtsp: Use ff_rtsp_averror() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-21 03:52:27 +02:00
Andrey Utkin
24dfd6e79b avformat/rtspcodes: introduce ff_rtsp_averror() 
Currently this is another name for ff_http_averror()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-21 03:51:14 +02:00
Rodger Combs
315f9e929d ffmpeg_opt: Add -start_at_zero option. 
This automatically shifts input timestamps to start at 0 instead of the file's
starting timestamp when using -copyts.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-21 03:31:33 +02:00
Michael Niedermayer
832b4c0a86 avcodec/libutvideodec: print extradata size if unsupported 
Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-21 03:05:49 +02:00
Michael Niedermayer
cec4e1c7c7 Merge commit 'd2771a1dc0a3695e8873adc16d068077f2417eea' 
* commit 'd2771a1dc0a3695e8873adc16d068077f2417eea':
  rtpproto: Free the addrinfo pointer on failure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-20 23:05:06 +02:00
Michael Niedermayer
5753d96771 Merge commit '96bfb677478514db73d1b63b4213c97ad4269e8f' 
* commit '96bfb677478514db73d1b63b4213c97ad4269e8f':
  nutdec: Prevent a memory corruption

Conflicts:
	libavformat/nutdec.c

See: 05dd5368a9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-20 22:35:37 +02:00
Michael Niedermayer
e162db66a2 Merge commit '350ed1829268d343b791208c8fd1cddd44d52a8e' 
* commit '350ed1829268d343b791208c8fd1cddd44d52a8e':
  rtpdec_hevc: drop unnecessary check

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-20 22:25:14 +02:00
Michael Niedermayer
20d3348e8a Merge commit '322b571d5591978efd6f6fee12181ac8900079fe' 
* commit '322b571d5591978efd6f6fee12181ac8900079fe':
  rtmpproto: remove dead code

See: 3a8b66af6c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-20 22:09:23 +02:00
Michael Niedermayer
2e0ac145d5 Merge commit 'd1afd3e1d6e43f4d37ae147091f270124ac48e04' 
* commit 'd1afd3e1d6e43f4d37ae147091f270124ac48e04':
  vf_format: check input validity

See: ee16e0cacc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-20 22:02:45 +02:00
Lukasz Marek
e493814d61 lavd: export all symbols with av_ prefix 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-10-20 22:01:36 +02:00
Michael Niedermayer
6ef4e0c8b8 Merge commit '7b48bf95242ebf95366d24d32e4cfca6aa77c5e2' 
* commit '7b48bf95242ebf95366d24d32e4cfca6aa77c5e2':
  wtv: clean memory on error

See: e47024d72f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-20 21:52:51 +02:00
Michael Niedermayer
c04f125bb4 Merge commit '9fbc613f0df1628e7e78bca791fa8833846f8210' 
* commit '9fbc613f0df1628e7e78bca791fa8833846f8210':
  wtv: check seek_by_sector return value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-20 21:43:44 +02:00
Michael Niedermayer
36552345d0 Merge commit 'd7f530b0d67fe3996dbfa990a47c865e0d1400a2' 
* commit 'd7f530b0d67fe3996dbfa990a47c865e0d1400a2':
  aviobuf: check context before using it

See: 7441d1ec33
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-20 21:25:37 +02:00
Michael Niedermayer
54112629f1 Merge commit '02484d1a9316a9309fc1830825345ab79f6a8d60' 
* commit '02484d1a9316a9309fc1830825345ab79f6a8d60':
  avio: fix sizeof argument

See: a96577df38
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-20 21:17:25 +02:00
Michael Niedermayer
ab077b3d7a Merge commit '8ab3b71e4b343cec3fa369a880ab4496d7345154' 
* commit '8ab3b71e4b343cec3fa369a880ab4496d7345154':
  idcin: fix return check

See: ee884c3023
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-20 21:00:18 +02:00
Rong Yan
a001db2e2c configure: fix bug to ensure that HAVE_VSX is only enabled when HAVE_ALTIVEC is enabled and in LE environment 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-20 19:58:02 +02:00
Thilo Borgmann
f31445a82d lavf/mov.c: Allocate buffer in case of long metadata entries. 
Fixes ticket #4018

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-20 19:27:34 +02:00
Brad Smith
04a4fb81b3 v4l2: Make use of the VIDIOC_ENUM_FRAMESIZES ioctl on OpenBSD 
Make use of the V4L2 VIDIOC_ENUM_FRAMESIZES ioctl on OpenBSD.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-20 14:56:58 +02:00
Kevin Mitchell
ff68ceb1b5 avfilter/vf_idet: add both multiple and single frame detection metadata 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-20 14:52:27 +02:00
Luca Barbato
d2771a1dc0 rtpproto: Free the addrinfo pointer on failure 
CC: libav-stable@libav.org
Bug-Id: CID 1238797
 2014-10-20 10:47:29 +01:00
Luca Barbato
96bfb67747 nutdec: Prevent a memory corruption 
Chapters do not have an event_flags field.

Bug-Id: CID 1231990
 2014-10-20 10:47:03 +01:00
Vittorio Giovara
350ed18292 rtpdec_hevc: drop unnecessary check 
len is always >=1 in that case.

Bug-Id: CID 1238784
 2014-10-20 10:44:42 +01:00
Vittorio Giovara
322b571d55 rtmpproto: remove dead code 
Expression already evaluated before, redundant since
0533868642.

Bug-Id: CID 732199
 2014-10-20 10:44:22 +01:00
Vittorio Giovara
d1afd3e1d6 vf_format: check input validity 
CC: libav-stable@libav.org
 2014-10-20 10:38:38 +01:00