diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-08 20:18:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-08 20:33:26 +0100 |
| commit | c4e8821732999f720535bb2eb1e8c7f1ea1db18f (patch) | |
| tree | 12b31863b7145b0342207aafd0ffa256da2904b9 /libavcodec/internal.h | |
| parent | fee484edaff77fc831d4cbbdd259ea0948103f86 (diff) | |
| parent | 7ecc2d403ce5c7b6ea3b1f368dccefd105209c7e (diff) | |
Merge commit '7ecc2d403ce5c7b6ea3b1f368dccefd105209c7e'
* commit '7ecc2d403ce5c7b6ea3b1f368dccefd105209c7e':
Move AVFrame from lavc to lavu.
Conflicts:
libavcodec/avcodec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/internal.h')
| -rw-r--r-- | libavcodec/internal.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/internal.h b/libavcodec/internal.h index af9e58eead..315b42fa65 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -213,6 +213,4 @@ int ff_codec_close_recursive(AVCodecContext *avctx); */ int avpriv_bprint_to_extradata(AVCodecContext *avctx, struct AVBPrint *buf); -AVDictionary **ff_frame_get_metadatap(AVFrame *frame); - #endif /* AVCODEC_INTERNAL_H */ |