1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Commit Graph

78589 Commits

Author SHA1 Message Date
Aman Gupta
2f26b67d55 lavc/ccaption_dec: do not ignore repeated character commands
control codes in a cc stream can be repeated, and must be ignored.
however, repeated characters must not be ignored. the code attempted to
wipe prev_cmd in handle_char to allow repeated characters to be
processed, but prev_cmd would previously get reset _after_ handle_char()

i also moved the prev_cmd reset out from handle_char() so it can be
re-used for special character sets, which _must_ be ignored when
repeated.
2016-02-17 21:32:18 +01:00
Mark Reid
f09449daa4 tests/fate: added dnxhr parser regression test
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-02-17 21:16:14 +01:00
Michael Niedermayer
c4ac30909e avutil/hwcontext: Remove duplicate ;
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-02-17 21:16:14 +01:00
Derek Buitenhuis
02dfa64c08 configure: Don't enable examples when --disable-everything is used
This resotres old behavior.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-02-17 19:20:49 +00:00
Paul B Mahol
38ed528fa5 avfilter/drawutils: >8 bit support
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2016-02-17 18:59:56 +01:00
Derek Buitenhuis
6b706ce85f Merge commit 'bd49be885e9ad6bae599c54473ba2fa2957eb140'
* commit 'bd49be885e9ad6bae599c54473ba2fa2957eb140':
  avconv_vdpau: use the hwcontext API to simplify code

Tested-by: wm4
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-02-17 16:47:05 +00:00
Derek Buitenhuis
d779d8d771 Merge commit 'a001ce31bc2bcf875a39b5fb22dae49120293b42'
* commit 'a001ce31bc2bcf875a39b5fb22dae49120293b42':
  hwcontext: add a VDPAU implementation

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-02-17 16:16:34 +00:00
Derek Buitenhuis
1a708780f3 Merge commit '89923e418b494e337683442ab896d754bc07341a'
* commit '89923e418b494e337683442ab896d754bc07341a':
  lavu: add a framework for handling hwaccel frames

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-02-17 16:12:25 +00:00
Derek Buitenhuis
26abd5149e Merge commit '721a4efc0545548a241080b53ab480e34f366240'
* commit '721a4efc0545548a241080b53ab480e34f366240':
  buffer: add support for pools using caller data in allocation

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-02-17 16:07:16 +00:00
Derek Buitenhuis
ae3c0a9c1f Merge commit 'c084d6d2cfb570b10d8784eb20cc696dfb7c5605'
* commit 'c084d6d2cfb570b10d8784eb20cc696dfb7c5605':
  buffersrc: default SAR to 0 (unknown) rather than 1

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-02-17 15:42:12 +00:00
Derek Buitenhuis
e8ebcb0034 Merge commit 'a2bb771a3cded8a05137c0effb34f61a2bc78e22'
* commit 'a2bb771a3cded8a05137c0effb34f61a2bc78e22':
  configure: Restore the --enable-everything behaviour

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-02-17 15:39:35 +00:00
Derek Buitenhuis
3bff005be8 Merge commit '5e1beec944dacd6b4ed7d710125dd508c41ca969'
* commit '5e1beec944dacd6b4ed7d710125dd508c41ca969':
  configure: Print which libraries will be built

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-02-17 15:39:16 +00:00
Derek Buitenhuis
470bfab470 Merge commit '21c750f240b9d0c41a258d1adee2d9f75ff378b6'
* commit '21c750f240b9d0c41a258d1adee2d9f75ff378b6':
  configure: Use `require` for the non-component options

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-02-17 15:36:51 +00:00
Derek Buitenhuis
f97ee815cf Revert "configure: Revert recent changes to disable-everything"
Following merges make it work as before.

This reverts commit cefad29df9.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-02-17 15:36:50 +00:00
Johan Ström
6c31c99289 hlsenc: add use_localtime_mkdir option to automatically create time-based directory
Use with -use_localtime, and set -hls_segment_filename to a path which
contains a subdirectory i.e. /some/path/%Y%m%d/%Y%m%dT%H%M%S-%s.ts
This will mkdir the %Y%m%d-part of the path if it does not already
exist.
In addition, each filename in the playlist output will be prefixed with
this subdirectory (if playlist and segment shares the same base path).

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-02-17 16:17:58 +01:00
Muhammad Faiz
7c11e727f6 avfilter/avf_showcqt: improve pts handling
correct output pts based on input pts
make seeking possible
output frame one by one on eof
tested with showinfo filter

Suggested-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-02-17 16:13:09 +01:00
Michael Niedermayer
c351126ee9 avcodec/eatqi: print error on mb decode failure
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-02-17 16:13:09 +01:00
Paul B Mahol
4dc5880381 avfilter/vf_drawbox: reindent
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2016-02-17 09:42:46 +01:00
Paul B Mahol
5589698e0b avfilter/vf_drawbox: add alpha pixel formats support
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2016-02-17 09:39:05 +01:00
Michael Niedermayer
f6492a2ea8 swscale/x86/output: Fix yuv2planeX_16* with unaligned destination
Reviewed-by: BBB
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-02-17 04:47:51 +01:00
Michael Niedermayer
d07f6e5f1c swscale/x86/output: Move code into yuv2planeX_mainloop
Reviewed-by: BBB
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-02-17 04:47:34 +01:00
Michael Niedermayer
2e8ad2d65a avcodec/mpeg12: Remove duplicate block_last_index setting code
Based on 7c25ffe070 and 58dd885f9a

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-02-16 21:47:56 +01:00
Michael Niedermayer
5c02c95f2c avcodec/mpeg12: Fix error return
Also remove a tab

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-02-16 21:46:00 +01:00
Michael Niedermayer
58f21b6c93 avformat/hls: fix potential integer overflow
This is not a regression

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-02-16 21:46:00 +01:00
Derek Buitenhuis
00bd237499 mov: Fix leftover merge conflict cruft
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-02-16 20:09:56 +00:00
Derek Buitenhuis
4e3185d208 Merge commit '5eb562831b3a9bea8026c413ef1338e06450d005'
This commit is a no-op.

* commit '5eb562831b3a9bea8026c413ef1338e06450d005':
  mov: Use the correct type for size

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-02-16 20:07:08 +00:00
Derek Buitenhuis
cbe3f28d0a Merge commit '8d34a2f803c9ca9433b5a51bacbbe352e8d327e2'
* commit '8d34a2f803c9ca9433b5a51bacbbe352e8d327e2':
  vdpau: Support for VDPAU accelerated HEVC decoding

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-02-16 20:05:28 +00:00
Derek Buitenhuis
1466379059 Merge commit '8958c5c64d05453204642b55a7b8b44c93023b17'
This commit is a no-op.

* commit '8958c5c64d05453204642b55a7b8b44c93023b17':
  hevc: Track long and short term RPS size for VDPAU

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-02-16 19:53:50 +00:00
Derek Buitenhuis
df61e4c241 Merge commit '8c399bd5cefd572eceb448981fcb6d4dbca35d27'
This commit is a no-op.

* commit '8c399bd5cefd572eceb448981fcb6d4dbca35d27':
  dxva2_hevc: properly signal the num_delta_pocs from the SPS RPS

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-02-16 19:52:36 +00:00
Derek Buitenhuis
0479cf8530 Merge commit 'e579d8b29cdb9b42c50a0fde277dfb047c1466ad'
* commit 'e579d8b29cdb9b42c50a0fde277dfb047c1466ad':
  lavf: Dump the cpb side data information

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-02-16 19:51:02 +00:00
Derek Buitenhuis
fab8d9717c Merge commit 'd005ccc630e42daab8ec2afecf972d1551a9401a'
This commit is a no-op. Ours should be superior.

* commit 'd005ccc630e42daab8ec2afecf972d1551a9401a':
  nvenc: rename a misnamed function
  nvenc: merge input and output surface structs
  nvenc: factor out the pixel format list

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-02-16 19:50:01 +00:00
Derek Buitenhuis
9a9f3f151f Merge commit 'fb25d99b0a5e21fb8cc184c7a9d3736387778266'
This commit is a no-op.

* commit 'fb25d99b0a5e21fb8cc184c7a9d3736387778266':
  buffersrc: do not discard the error from ff_filter_frame()

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-02-16 19:48:39 +00:00
Derek Buitenhuis
c82d31808b Merge commit 'f7d77b9a5dd42bf0f5dffecf590466b4c4239437'
* commit 'f7d77b9a5dd42bf0f5dffecf590466b4c4239437':
  eatqi: Remove MpegEncContext dependency

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-02-16 19:41:55 +00:00
Derek Buitenhuis
58dd885f9a Merge commit '7c25ffe070c286874a8c3513f7504b90e1626b0c'
* commit '7c25ffe070c286874a8c3513f7504b90e1626b0c':
  mpeg1: Make intra-block decoding independent of MpegEncContext

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-02-16 19:25:17 +00:00
Derek Buitenhuis
8e2105297d Merge commit '249827f736db4c94dfcb24a3883aa4c04f9b119b'
* commit '249827f736db4c94dfcb24a3883aa4c04f9b119b':
  mpeg12dec: Refactor mpeg1_decode_block_intra()

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-02-16 19:05:26 +00:00
Derek Buitenhuis
2ec66ff83d Merge commit 'cdbaa436042ba59c3b2bd7e9652e9a14136fd604'
* commit 'cdbaa436042ba59c3b2bd7e9652e9a14136fd604':
  mpeg12dec: Always close reader on error

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-02-16 19:01:05 +00:00
Paul B Mahol
c4ed213675 avfilter/f_streamselect: check if map is available
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2016-02-16 19:18:31 +01:00
Derek Buitenhuis
ea1f47757b Merge commit '7a00653be6b13131ce1b2cdeca696429f57caaf8'
* commit '7a00653be6b13131ce1b2cdeca696429f57caaf8':
  tiny_psnr: Support large files

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-02-16 18:11:05 +00:00
Lou Logan
ddc9a587f9 doc/filters: remove redundant example
Newer example in blend from f80b475 is faster and simpler.

Signed-off-by: Lou Logan <lou@lrcd.com>
2016-02-16 08:54:19 -09:00
Derek Buitenhuis
55cada3010 Merge commit '99214d42a902c8392d7887c08fdc5dc1fc2475ae'
This commit is a no-op. FFmpeg already has this.

* commit '99214d42a902c8392d7887c08fdc5dc1fc2475ae':
  dnxhd: Make the encoder message friendlier

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-02-16 17:48:30 +00:00
Derek Buitenhuis
1c417bad61 Merge commit '34c9eba982c75196392a3b0b245dd34297c4511d'
* commit '34c9eba982c75196392a3b0b245dd34297c4511d':
  configure: Refactor toolchain flag setting

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-02-16 17:44:33 +00:00
Derek Buitenhuis
a236e4e8b8 Merge commit 'dd53af4b37c7790ce26065b36d5655c1af38b295'
This commit is a no-op. I don't want to enrange Certain People
who like to --disable-*.

* commit 'dd53af4b37c7790ce26065b36d5655c1af38b295':
  avplay: drop support for building without lavfi

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-02-16 17:40:08 +00:00
Derek Buitenhuis
8bbca8de39 Merge commit '5781bfae0cf4271278a8bea176d615cb5c222335'
This commit is a no-op.

* commit '5781bfae0cf4271278a8bea176d615cb5c222335':
  flacenc: Load default prediction_order parameters if none is selected
  asfdec: make sure packet_size is non-zero before seeking
  asfdec: check for too small size in asf_read_unknown
  asfdec: check avio_skip in asf_read_simple_index
  asfdec: break if EOF is reached after asf_read_packet_header

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-02-16 17:37:47 +00:00
Derek Buitenhuis
e7b8ec8b6f Merge commit '389b79842c67b1f5730215a752a5f89cb1b8d9a3'
This commit is a no-op.

* commit '389b79842c67b1f5730215a752a5f89cb1b8d9a3':
  msvc: Fix libx264 linking
  doc: Improve the channelsplit example
  configure: Support MSYS2 mingw-w64 64bit

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-02-16 17:34:24 +00:00
Derek Buitenhuis
04e4166536 Merge commit 'e280fe13291e9c712a5f4aa13b5263f3e8afed45'
* commit 'e280fe13291e9c712a5f4aa13b5263f3e8afed45':
  v210: Use separate sample_factors

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-02-16 17:23:32 +00:00
Derek Buitenhuis
6bff2b5f6a Merge commit '15ec7aa4170ed05ad1b17000ef1e3940d0a0c5e7'
This commit is a no-op.

* commit '15ec7aa4170ed05ad1b17000ef1e3940d0a0c5e7':
  v210: Add avx2 version of the 10-bit line encoder
  v210: Add avx2 version of the 8-bit line encoder

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-02-16 17:21:29 +00:00
Derek Buitenhuis
dc22269b23 Merge commit '1ba1fede9dfe03dc48862e5e0530cca7192f5038'
This commit is a no-op.

* commit '1ba1fede9dfe03dc48862e5e0530cca7192f5038':
  flacenc: Restore defaults and range for {min, max}_prediction_order

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-02-16 17:12:00 +00:00
Derek Buitenhuis
113c256533 Merge commit '60f0fde3092d18d4d36555962c192af8691a099c'
This commit is a no-op.

* commit '60f0fde3092d18d4d36555962c192af8691a099c':
  libx264: Make sure to preserve default option values

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-02-16 17:06:54 +00:00
Derek Buitenhuis
2f78be0019 Merge commit '77a44f577b644a328dcf90cde11d2ecae69eda05'
This commit is a no-op.

* commit '77a44f577b644a328dcf90cde11d2ecae69eda05':
  configure: add missing avx2 support check
  x86: Add ymm_reg struct

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-02-16 17:03:30 +00:00
Derek Buitenhuis
8f8381bf03 Merge commit 'eafb05fcf37cd19a910ca3b17824384f9006bc0a'
* commit 'eafb05fcf37cd19a910ca3b17824384f9006bc0a':
  v210: x86: Add the correct guards around the asm code

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-02-16 17:02:56 +00:00