Merge commit '52ec149fbee57b6ca817049c9706212a0774a32c'

* commit '52ec149fbee57b6ca817049c9706212a0774a32c':
  h2645_parse: change the AVCodecContext* parameter to void*

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis
2016-04-26 14:04:03 +01:00
2 changed files with 8 additions and 8 deletions

View File

@@ -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.