diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-26 14:04:03 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-26 14:04:48 +0100 |
| commit | b5c10c4c9274b06a7bd6f6e1f0f4c129aa6e892c (patch) | |
| tree | 22838221c1d4106d9817720d0799ff03f627a0ea /libavcodec/h2645_parse.h | |
| parent | 8e73574d4f176d166f08959f6c84e6bc3ffef79c (diff) | |
| parent | 52ec149fbee57b6ca817049c9706212a0774a32c (diff) | |
| download | ffmpeg-b5c10c4c9274b06a7bd6f6e1f0f4c129aa6e892c.tar.gz | |
Merge commit '52ec149fbee57b6ca817049c9706212a0774a32c'
* commit '52ec149fbee57b6ca817049c9706212a0774a32c':
h2645_parse: change the AVCodecContext* parameter to void*
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/h2645_parse.h')
| -rw-r--r-- | libavcodec/h2645_parse.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h2645_parse.h b/libavcodec/h2645_parse.h index 05c21b03dc..cbf07a2f9d 100644 --- a/libavcodec/h2645_parse.h +++ b/libavcodec/h2645_parse.h @@ -63,7 +63,7 @@ int ff_h2645_extract_rbsp(const uint8_t *src, int length, * Split an input packet into NAL units. */ int ff_h2645_packet_split(H2645Packet *pkt, const uint8_t *buf, int length, - AVCodecContext *avctx, int is_nalff, int nal_length_size); + void *logctx, int is_nalff, int nal_length_size); /** * Free all the allocated memory in the packet. |