highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
68,714 Commits 36 Branches 392 Tags
fd7bb09e8a33b30d0d4f8542b266f6ada7051cc2
Commit Graph

68714 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
f569422d66 avformat/mxfenc: Accept MXF D-10 with 49.999840 Mbit/sec 
This is the maximum rate possible based on the frame size limit of MXF D-10

Previous version reviewed by tim nicholson <nichot20@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d7a762553c)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-28 02:33:56 +02:00
Ganesh Ajjanagadde
3dc303a051 swresample/dither: check memory allocation 
check memory allocation in swri_get_dither()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 196b885a5f)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-28 02:33:56 +02:00
Andreas Cadhalpun
42c54f8f4d libopenjpegenc: add NULL check for img before accessing it 
If opj_image_create fails to allocate an image it returns NULL, which
causes a segmentation fault at 'img->x0 = 0'.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
(cherry picked from commit 1577526b47)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-28 02:33:56 +02:00
Michael Niedermayer
fd989ff9ca swresample: Check the return value of resampler->init() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 02915602d9)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-28 02:33:56 +02:00
Luca Barbato
6b2163caab h264: Make sure reinit failures mark the context as not initialized 
(cherry picked from commit 0181ae9af2)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-28 02:33:56 +02:00
Michael Niedermayer
a61759596d ffmpeg_opt: Set the video VBV parameters only for the video stream from -target 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 2ce6e41911)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-28 02:33:56 +02:00
Michael Niedermayer
8d98fbef16 avcodec/bitstream: Assert that there is enough space left in avpriv_copy_bits() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 291ad5cc9c)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-28 02:33:56 +02:00
Michael Niedermayer
4ac8b94a73 avcodec/put_bits: Assert that there is enough space left in skip_put_bytes() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8f5ffed183)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-28 02:33:56 +02:00
Michael Niedermayer
e83d998634 avcodec/mpegvideo_enc: Update the buffer size as more slices are merged 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 561d3a57aa)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-28 02:33:56 +02:00
Michael Niedermayer
962ad32891 avcodec/put_bits: Update size_in_bits in set_put_bits_buffer_size() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e4c2ec879b)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-28 02:33:55 +02:00
Rodger Combs
9e1a818a2d avformat/wavdec: Increase dts packet threshold to fix more misdetections 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 40a3e1e9c5)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-28 02:33:55 +02:00
Michael Niedermayer
f1a4af4dc2 avformat/wavdec: Increase probe_packets limit 
Fixes DTS detection of b2429e5ba9.dts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 9f5769437a)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-28 02:33:55 +02:00
Michael Niedermayer
51a624bb80 avformat/swfdec: Do not error out on pixel format changes 
Instead print an error and continue

Fixes Ticket4702

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6a1204a1a4)
 2015-07-08 12:44:44 +02:00
Michael Niedermayer
e9502ee26a avfilter/x86/vf_hqdn3d: Fix register types 
Fixes Ticket4301

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 52fc3e372f)
 2015-06-19 11:11:41 +02:00
Michael Niedermayer
11f597ed84 avcodec/mjpegenc_common: Use ff_mpv_reallocate_putbitbuffer() 
Fixes assertion failure
Fixes Ticket4396

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c50904fd78)
 2015-06-19 11:11:26 +02:00
Michael Niedermayer
2e210e19b1 avcodec/mpegvideo: Factor ff_mpv_reallocate_putbitbuffer() out 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 00f3bb2ef2)
 2015-06-19 11:11:18 +02:00
Michael Niedermayer
d4c7a1ecb8 avformat/mov: Mark avio context of decompressed atoms as seekable 
Fixes Ticket4329

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8ce564ea28)
 2015-06-19 11:10:58 +02:00
Michael Niedermayer
2d55d3483b avcodec/hevc_ps: Only discard overread VPS if a previous is available 
Fixes Ticket4621

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 57078e4d25)
 2015-06-19 11:10:43 +02:00
Michael Niedermayer
e29f68cf9e avcodec/x86/h264_weight: handle weight1=128 
Fix ticket4596

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e100966575)
 2015-06-19 11:10:30 +02:00
Paul B Mahol
f621ae6a6d avcodec/exr: fix crash caused by merge 
Various header informations need to be reset when decoding next frame.
Regression since: 95582b5c

Fixes ticket #4597.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
(cherry picked from commit a03b69478b)
 2015-06-19 11:10:13 +02:00
Andreas Cadhalpun
21d0ae829f nutdec: abort if EOF is reached in decode_info_header/read_sm_data 
These loops can take a lot of time if count is very large.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
(cherry picked from commit bb23a15df5)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
n2.5.7 		2015-05-23 00:57:08 +02:00
Andreas Cadhalpun
af27254eb3 nutdec: stop skipping bytes at EOF 
This can unnecessarily waste a lot of time.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
(cherry picked from commit fa7dec8cb0)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-23 00:56:38 +02:00
Andreas Cadhalpun
ffb4362bf0 nutdec: fix infinite resync loops 
nut->last_syncpoint_pos doesn't necessarily change between resync
attempts, so find_any_startcode can return the same startcode again.

Thus remember where the last resync happened and don't try to resync
before that.

This can't be done locally in nut_read_packet, because this wouldn't
prevent infinite resync loops, where after the resync a packet is
returned and while reading a following packet the resync happens again.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
(cherry picked from commit 37e679881d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-23 00:55:57 +02:00
Michael Niedermayer
3ea101b234 avformat/nutdec: Check X in 2nd branch of index reading 
Prevents read of uninitialized variable

Based on patch by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ebb0ca3d70)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-23 00:52:44 +02:00
Michael Niedermayer
3c7ea2c46e Update for 2.5.7 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-21 21:42:38 +02:00
Michael Niedermayer
682ccd4167 avformat/nutdec: Fix recovery when immedeately after seeking a failure happens 
Found-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b3496b4a33)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-21 20:43:39 +02:00
Michael Niedermayer
e7e1832cfd avformat/nutdec: Return error on EOF from get_str() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6bbb2f8f4d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-21 20:43:39 +02:00
Andreas Cadhalpun
23e88c81d6 nutdec: fix memleaks on error in nut_read_header 
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 361702660d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-21 20:43:39 +02:00
Martin Storsjö
6b7c621839 rtsp: Make sure we don't write too many transport entries into a fixed-size array 
(cherry picked from commit b90adb0aba)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-21 20:43:39 +02:00
Andrey Utkin
3d65a272da rtpenc_jpeg: handle case of picture dimensions not dividing by 8 
This fixes the calculation of the number of needed blocks to make
sure that ALL pixels are represented by the result.

Reviewed-by: Thomas Volkert <silvo@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 7f64a7503b)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-21 20:43:39 +02:00
Michael Niedermayer
458ba000a5 avformat/mp3dec: Check for avcodec_alloc_context3() failure 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b851bc20c6)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-21 20:43:39 +02:00
Michael Niedermayer
64c82912a7 avformat/mp3dec: properly allocate dummy AVCodecContext 
Fixes (harmless) use of uninitialized variable

Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6ad42b3e15)

Conflicts:

	libavformat/mp3dec.c
 2015-05-21 20:43:39 +02:00
Nicolas George
1aaf9613a8 lavd/xcbgrab: fix comparison with screen size. 
Signed-off-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 7971fa9ce0)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-21 20:43:39 +02:00
Michael Niedermayer
8b95fc6d8d avcodec/golomb: get_ur_golomb_jpegls: Fix reading huge k values 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c720b9ce98)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-21 20:43:39 +02:00
Michael Niedermayer
10b77a3471 avformat/mov: Fix parsing short loci 
Fixes Ticket4557

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 50393bce31)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-21 20:43:39 +02:00
Michael Niedermayer
7e3d413f12 avformat/mov: Print reason of loci parsing failure 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 9e4f0cfc8f)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-21 20:43:39 +02:00
Michael Niedermayer
1bf416dfc3 avcodec/hevc: Fix typo in num_entry_point_offsets check 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3051e7fa71)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-21 20:43:39 +02:00
Michael Niedermayer
d3c9d87eea avcodec/libtheoraenc: Check for av_malloc failure 
Fixes CID1257799

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c64b2d480b)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-21 20:43:39 +02:00
Michael Niedermayer
228f7c7eed avcodec/dcadec: Check active_bands 
Fixes CID1297594 part2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit fc624ec9ba)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-21 20:43:39 +02:00
Michael Niedermayer
ba82b23a1d avcodec/dcadec: Check scale table index 
Fixes CID1297594 part 1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0f3e6959bf)

Conflicts:

	libavcodec/dcadec.c
 2015-05-21 20:43:39 +02:00
Michael Niedermayer
665b343f92 avcodec/sonic: More completely check sample_rate_index and channels 
Fixes CID1271783

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ade8a46154)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-21 20:43:39 +02:00
Michael Niedermayer
43f9ec7113 avcodec/sonic: check memory allocations 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c131a9fead)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-21 20:43:39 +02:00
Michael Niedermayer
8d02ba5b7b avcodec/smvjpegdec: check avcodec_decode_video2() return code 
Fixes CID1271810

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit cdd25f9a3d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-21 20:43:39 +02:00
Michael Niedermayer
cb0cc44f3a avcodec/shorten: More complete pred_order check 
Fixes CID1239055

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 294469416d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-21 20:43:39 +02:00
Michael Niedermayer
71689e7863 avcodec/shorten: Check skip_bytes() 
Fixes CID1210526

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d201becfc0)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-21 20:43:39 +02:00
Michael Niedermayer
d2fbf8b569 avcodec/shorten: Fix code depending on signed overflow behavior 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 2d15588124)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-21 20:43:39 +02:00
Michael Niedermayer
c14359f24d avcodec/proresdec2: Reset slice_count on deallocation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c4c6aea397)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-21 20:43:39 +02:00
Michael Niedermayer
9fb1c02f30 ffmpeg_opt: Fix -timestamp parsing 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 107e4da476)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-21 20:43:39 +02:00
Michael Niedermayer
4a49f1e764 avcodec/dcadec: Check subsubframes 
Fixes: CID1239152

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a9bf628bfd)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-21 20:43:39 +02:00
Michael Niedermayer
474bfd5438 avcodec/dcadec: Check nchans 
Fixes CID1239110

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a6a45774d0)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-21 20:43:39 +02:00