Stowage/ffmpeg
2
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-08 06:09:50 +00:00
Code Issues Projects Releases Packages Wiki Activity
83534 commits 38 branches 415 tags 263 MiB
Commit graph

17 commits

Author SHA1 Message Date
James Almer
8c7932884d Merge commit 'f638b67e57' 
* commit 'f638b67e57':
  h264: move the parameter set definitions to a new header file

Conflicts:
libavcodec/h264_parse.h
libavcodec/h264_ps.c
libavcodec/h264dec.h

Merged-by: James Almer <jamrial@gmail.com>
 2016-08-01 12:58:09 -03:00
Clément Bœsch
8ef57a0d61 Merge commit '41ed7ab45f' 
* commit '41ed7ab45f':
  cosmetics: Fix spelling mistakes

Merged-by: Clément Bœsch <u@pkh.me>
 2016-06-21 21:55:34 +02:00
Anton Khirnov
f638b67e57 h264: move the parameter set definitions to a new header file 
The PS parsing code is independent from the decoder, so it makes more
sense for it to have its own separate header.
 2016-06-21 11:13:29 +02:00
Clément Bœsch
4fdea02d68 lavc/h264: add a logging ctx to ff_h264_pred_weight_table() 2016-06-20 10:36:16 +02:00
Clément Bœsch
0ed14bba12 Merge commit '72da8d9bb2' 
* commit '72da8d9bb2':
  h264_parser: remove the remaining dependencies on the h264 decoder

Merged-by: Clément Bœsch <u@pkh.me>
 2016-06-19 12:50:24 +02:00
Clément Bœsch
0bf5fd2e19 Merge commit '98c97994c5' 
* commit '98c97994c5':
  h264: decouple extradata parsing from the decoder

Main changes:

- move get_avc_nalsize() inside h264_parser.c and make it use
  H264ParseContext instead of H264Context. This helps fixing
  fate-flv-demux.

- Also use is_avc/nal_length_size from the H264ParseContext in various
  places instead of the H264Context one as that's the fields now filled
  by ff_h264_decode_extradata()

- h264_parse: dont fail decode_extradata_ps() due to nal split failure.
  Change by Michael to fix decoding of h264/ref_10.avi.

Merged-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-06-19 12:17:41 +02:00
Clément Bœsch
bd3fd467fe Merge commit 'c8dcff0cdb' 
* commit 'c8dcff0cdb':
  h264: factor out calculating the POC count into a separate file

Merged-by: Clément Bœsch <u@pkh.me>
 2016-06-12 19:01:43 +02:00
Derek Buitenhuis
278dcec28d Merge commit 'a6e27f7add' 
* commit 'a6e27f7add':
  h264: factor out parsing the reference count into a separate file

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-17 15:16:38 +01:00
Vittorio Giovara
41ed7ab45f cosmetics: Fix spelling mistakes 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2016-05-04 18:16:21 +02:00
Derek Buitenhuis
a2922b5d61 Merge commit 'ecc31f6b08' 
* commit 'ecc31f6b08':
  h264: move ff_h264_check_intra[4x4]_pred_mode() to h264_parse

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-27 16:34:40 +01:00
Derek Buitenhuis
ee38234c43 Merge commit 'e481458bc3' 
* commit 'e481458bc3':
  h264: factor out pred weight table parsing into a separate file

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-26 15:04:29 +01:00
Anton Khirnov
72da8d9bb2 h264_parser: remove the remaining dependencies on the h264 decoder 2016-04-24 10:06:24 +02:00
Anton Khirnov
98c97994c5 h264: decouple extradata parsing from the decoder 
This will allow decoupling the parser from the decoder.
 2016-04-24 10:06:24 +02:00
Anton Khirnov
c8dcff0cdb h264: factor out calculating the POC count into a separate file 
This will allow decoupling the parser from the decoder.
 2016-04-24 10:06:24 +02:00
Anton Khirnov
a6e27f7add h264: factor out parsing the reference count into a separate file 
This will allow decoupling the parser from the decoder.
 2016-04-24 10:06:23 +02:00
Anton Khirnov
ecc31f6b08 h264: move ff_h264_check_intra[4x4]_pred_mode() to h264_parse 
It is shared with svq3.
 2016-03-28 09:53:56 +02:00
Anton Khirnov
e481458bc3 h264: factor out pred weight table parsing into a separate file 
This will allow decoupling the parser from the decoder.
 2016-03-28 09:48:31 +02:00