diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-24 12:04:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-24 12:15:56 +0200 |
| commit | 029353e427dab092444008085ac330009a1707bd (patch) | |
| tree | 8d2bbfcd2e955e8745c6b544f4e14730cbb98e1b /libavcodec/h264.h | |
| parent | cf6ed1f1293c2dd69b76d9246a916925b58b7bbf (diff) | |
| parent | e9e5a1bdc769a7225ab0d4f8b33bcacc6496bd68 (diff) | |
| download | ffmpeg-029353e427dab092444008085ac330009a1707bd.tar.gz | |
Merge commit 'e9e5a1bdc769a7225ab0d4f8b33bcacc6496bd68'
* commit 'e9e5a1bdc769a7225ab0d4f8b33bcacc6496bd68':
Monkey's Audio old versions FATE tests
h264_parser: Set field_order and picture_structure.
Conflicts:
libavcodec/h264_parser.c
tests/fate/lossless-audio.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 61e1bcb427..ed07ad6778 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -976,5 +976,6 @@ static av_always_inline int get_dct8x8_allowed(H264Context *h) } void ff_h264_draw_horiz_band(H264Context *h, int y, int height); +int ff_init_poc(H264Context *h, int pic_field_poc[2], int *pic_poc); #endif /* AVCODEC_H264_H */ |