summaryrefslogtreecommitdiff
path: root/libavcodec/h264.c
Commit message (Collapse)AuthorAge
* avcodec/h264: Undefined behavior (left shift of 12852653 by 8 places cannot ↵Michael Niedermayer2014-10-08
| | | | | | | | | be represented in type 'int') Fixes: asan_heap-oob_84f75d_8_asan_heap-oob_a2a00a_341_mbc.ts Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/h264: Check mode before considering mixed mode intra predictionMichael Niedermayer2014-10-04
| | | | | | | | Fixes out of array read Fixes: asan_heap-oob_e476fc_2_asan_heap-oob_1333ec6_61_CAMACI3_Sony_C.jsv Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/h264: Use FF_ALLOCZ_ARRAY_OR_GOTO()Michael Niedermayer2014-09-10
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/h264: Allow partial escapingMichael Niedermayer2014-09-07
| | | | | | Fixes Ticket3923 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/h264: Do not get stuck on IDR inter framesMichael Niedermayer2014-08-31
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/h264: Move h264_vdpau_class under ifdef to avoid unused variable warningMichael Niedermayer2014-08-28
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/h264: do proper cleanup in ff_h264_alloc_tables() in case DPB alloc ↵Michael Niedermayer2014-08-23
| | | | | | fails Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* h264: do not return on sidedata allocation failureChristophe Gisquet2014-08-23
| | | | | | | | Not having allocated it is not a good reason to leave the object in an undetermined state. Though a particular setting like the AV_EF_* flags could be useful to control that behaviour. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39'Michael Niedermayer2014-08-15
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39': cosmetics: Write NULL pointer equality checks more compactly Conflicts: cmdutils.c ffmpeg_opt.c ffplay.c libavcodec/dvbsub.c libavcodec/dvdsubdec.c libavcodec/dvdsubenc.c libavcodec/dxa.c libavcodec/libxvid_rc.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/rv10.c libavcodec/tiffenc.c libavcodec/utils.c libavcodec/vc1dec.c libavcodec/zmbv.c libavdevice/v4l2.c libavformat/matroskadec.c libavformat/movenc.c libavformat/sdp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Write NULL pointer equality checks more compactlyGabriel Dume2014-08-15
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'a7e541c9926d531a100ba0d36f4e56956dd84651'Michael Niedermayer2014-08-07
|\| | | | | | | | | | | | | * commit 'a7e541c9926d531a100ba0d36f4e56956dd84651': h264: fix interpretation of interleved stereo modes Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: fix interpretation of interleved stereo modesFelix Abecassis2014-08-07
| | | | | | | | | | | | Column and row frame packing arrangements were inverted. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | h264: remove useless assignment.Benoit Fouet2014-08-01
| | | | | | | | | | | | | | source index, as well as dest one, is unconditionnaly set afterwards, before being effectively used. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h264: support AV_PKT_DATA_NEW_EXTRADATAMichael Niedermayer2014-07-23
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h264: factor is_extra() outMichael Niedermayer2014-07-23
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '2d60444331fca1910510038dd3817bea885c2367'Michael Niedermayer2014-07-17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2d60444331fca1910510038dd3817bea885c2367': dsputil: Split motion estimation compare bits off into their own context Conflicts: configure libavcodec/Makefile libavcodec/arm/Makefile libavcodec/dvenc.c libavcodec/error_resilience.c libavcodec/h264.h libavcodec/h264_slice.c libavcodec/me_cmp.c libavcodec/me_cmp.h libavcodec/motion_est.c libavcodec/motion_est_template.c libavcodec/mpeg4videoenc.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/x86/Makefile libavcodec/x86/me_cmp_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Split motion estimation compare bits off into their own contextDiego Biurrun2014-07-17
| |
* | Merge commit '2db953f84671997e936f91140ffb5143c1537844'Michael Niedermayer2014-07-17
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '2db953f84671997e936f91140ffb5143c1537844': h264: K&R formatting cosmetics Conflicts: libavcodec/h264.c libavcodec/h264_direct.c libavcodec/h264_slice.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: K&R formatting cosmeticsLuca Barbato2014-07-17
| | | | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de> Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '18e3d61e9e3b52c177aa7a1f2a054a8a753e1b09'Michael Niedermayer2014-07-10
|\| | | | | | | | | | | | | | | | | | | * commit '18e3d61e9e3b52c177aa7a1f2a054a8a753e1b09': h264: parse display orientation SEI message Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: parse display orientation SEI messageVittorio Giovara2014-07-09
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | avcodec/h264: do not leave ret random on minor failures, causing major failureMichael Niedermayer2014-06-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '772d150a6e82542c06b0c251e73dd299d98d1027'Michael Niedermayer2014-06-24
|\| | | | | | | | | | | | | * commit '772d150a6e82542c06b0c251e73dd299d98d1027': h264: error out from decode_nal_units() when AV_EF_EXPLODE is set Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: error out from decode_nal_units() when AV_EF_EXPLODE is setVittorio Giovara2014-06-23
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | avcodec/h264: Use named identifier for single thread fall-back return from ↵Michael Niedermayer2014-06-19
| | | | | | | | | | | | ff_h264_decode_slice_header() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h264: fix frame skip codeMichael Niedermayer2014-06-16
| | | | | | | | | | | | Fixes Ticket3475 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h264: use the correct level for droping non intra framesMichael Niedermayer2014-06-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h264: in the absence of recovery points, be more tolerant on ↵Michael Niedermayer2014-06-04
| | | | | | | | | | | | | | accepting plain I frames Fixes: Ticket3652 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h264: mark recovery_cnt==0 frames as keyframesMichael Niedermayer2014-05-03
| | | | | | | | | | | | Fixes Ticket3063 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h264/find_start_code: factorize addition outMichael Niedermayer2014-04-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'e10fd08aa7fbe8645545ad2e8721f0ed03c8e06a'Michael Niedermayer2014-04-07
|\| | | | | | | | | | | | | | | | | | | * commit 'e10fd08aa7fbe8645545ad2e8721f0ed03c8e06a': h264: Refactor decode_nal_units Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: Refactor decode_nal_unitsLuca Barbato2014-04-06
| |
* | avcodec: Make ff_print_debug_info2() independant of Picture structMichael Niedermayer2014-03-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-03-24
|\| | | | | | | | | | | | | | | | | | | | | * qatar/master: h264: Split h264 slice decoding from nal decoding Conflicts: libavcodec/Makefile libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: Split h264 slice decoding from nal decodingLuca Barbato2014-03-23
| |
* | Merge commit 'e9a77f4bc084e5174baba3a8bc869ce4d102c4f0'Michael Niedermayer2014-03-24
|\| | | | | | | | | | | | | | | | | | | | | * commit 'e9a77f4bc084e5174baba3a8bc869ce4d102c4f0': h264: move macroblock decoding into its own file Conflicts: libavcodec/Makefile libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move macroblock decoding into its own fileVittorio Giovara2014-03-23
| |
* | avcodec/h264: fix Lossless Decoding (Profile 244) for 8x8 Intra PredictionYogender Kumar Gupta2014-03-18
| | | | | | | | | | | | This is limited to the case where x264_build = -1, to not break x264 decoding Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'd24e9a99a40166bf881ccd2e3ae5688af4726658'Michael Niedermayer2014-03-17
|\| | | | | | | | | | | | | * commit 'd24e9a99a40166bf881ccd2e3ae5688af4726658': h264 does not depend on mpegvideo any more Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264 does not depend on mpegvideo any moreVittorio Giovara2014-03-16
| |
* | Merge commit 'e0c16e4e3259cf50b5bac4c23bb6e517f397c74b'Michael Niedermayer2014-03-17
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e0c16e4e3259cf50b5bac4c23bb6e517f397c74b': mpegvideo: move mpegvideo formats-related defines to mpegutils.h Conflicts: libavcodec/h264_cabac.c libavcodec/h264_cavlc.c libavcodec/h264_mvpred.h libavcodec/svq1enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: move mpegvideo formats-related defines to mpegutils.hVittorio Giovara2014-03-16
| |
* | Merge commit '136034d86b5cb1819a2c3e6ecdfeb05dcba7140d'Michael Niedermayer2014-03-17
|\| | | | | | | | | | | | | * commit '136034d86b5cb1819a2c3e6ecdfeb05dcba7140d': h264: Remove MotionEstContext and move the relevant fields to H264Context Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: Remove MotionEstContext and move the relevant fields to H264ContextVittorio Giovara2014-03-16
| | | | | | | | Unused buffers scratchpad and temp have been dropped too.
* | Merge commit 'e3c2d0f3d41f79f7be7ba944aaca2e287c7d5c7c'Michael Niedermayer2014-03-17
|\| | | | | | | | | | | | | | | | | | | * commit 'e3c2d0f3d41f79f7be7ba944aaca2e287c7d5c7c': h264: Replace mpegvideo-specific MAX_THREADS by private define Conflicts: libavcodec/h264.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: Replace mpegvideo-specific MAX_THREADS by private defineVittorio Giovara2014-03-16
| |
* | Merge commit '5d1c2e53ab3ce27b48c138d22bb01ff8e8304f27'Michael Niedermayer2014-03-17
|\| | | | | | | | | | | | | | | | | | | | | * commit '5d1c2e53ab3ce27b48c138d22bb01ff8e8304f27': h264: Replace mpegvideo-specific MAX_PICTURE_COUNT by private define Conflicts: libavcodec/h264.c libavcodec/h264_ps.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: Replace mpegvideo-specific MAX_PICTURE_COUNT by private defineVittorio Giovara2014-03-16
| |
* | avcodec/h264: h264_set_erpic() clear destinationMichael Niedermayer2014-03-17
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '9b749c8274f6b6f35dde2cf29b99fa4f719abf87'Michael Niedermayer2014-03-17
|\| | | | | | | | | | | | | | | | | | | * commit '9b749c8274f6b6f35dde2cf29b99fa4f719abf87': h264: move relevant fields from Picture to H264Picture Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>