summaryrefslogtreecommitdiffstats
path: root/libavcodec/h264.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-04-29 13:24:18 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-04-29 13:26:33 +0200
commitd3a5dba81b3a0ab79df38751d31a6e7d8e251654 (patch)
treea31d42cacab4ed5a6512ecb61e130c31c44e9eba /libavcodec/h264.h
parentab7ad5e6a1b8359b169e7bcbe96ce7162d0c0002 (diff)
parent11f024ef0ab923ed8680fc35a087d576e549c849 (diff)
downloadffmpeg-streaming-d3a5dba81b3a0ab79df38751d31a6e7d8e251654.zip
ffmpeg-streaming-d3a5dba81b3a0ab79df38751d31a6e7d8e251654.tar.gz
Merge commit '11f024ef0ab923ed8680fc35a087d576e549c849'
* commit '11f024ef0ab923ed8680fc35a087d576e549c849': h264: move freeing the escaped RBSP buffer to free_context() Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.h')
-rw-r--r--libavcodec/h264.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index 5026ab2..12e5245 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -1184,7 +1184,7 @@ int ff_h264_update_thread_context(AVCodecContext *dst,
void ff_h264_flush_change(H264Context *h);
-void ff_h264_free_tables(H264Context *h, int free_rbsp);
+void ff_h264_free_tables(H264Context *h);
void ff_h264_set_erpic(ERPicture *dst, H264Picture *src);
OpenPOWER on IntegriCloud