diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-13 00:29:25 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-13 00:39:48 +0100 |
commit | 8bc7fe4daf5c26555d77e2261c96ee14a800fad4 (patch) | |
tree | 71999a1eb8bacb609b5789b34de369ed4b049cd4 /libavcodec/h264.h | |
parent | c83ef636a665b2e17f1b6745a98ec7a5719264df (diff) | |
parent | 58c42af722cebecd86e340dc3ed9ec44b1fe4a55 (diff) | |
download | ffmpeg-streaming-8bc7fe4daf5c26555d77e2261c96ee14a800fad4.zip ffmpeg-streaming-8bc7fe4daf5c26555d77e2261c96ee14a800fad4.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doxygen: misc consistency, spelling and wording fixes
vcr1: drop unnecessary emms_c() calls without MMX code
Replace all uses of av_close_input_file() with avformat_close_input().
lavf: add avformat_close_input().
lavf: deprecate av_close_input_stream().
lavf doxy: add some basic demuxing documentation.
lavf doxy: add some general lavf information.
lavf doxy: add misc utility functions to a group.
lavf doxy: add av_guess_codec/format to the encoding group.
lavf doxy: add core functions to a doxy group.
Add basic libavdevice documentation.
lavc: convert error_recognition to err_recognition.
avconv: update -map option help text
x86: Require 7 registers for the cabac asm
x86: bswap: remove test for bswap instruction
bswap: make generic implementation more compiler-friendly
h264: remove useless cast
proresdec: fix decode_slice() prototype
Conflicts:
configure
doc/APIchanges
ffprobe.c
libavcodec/avcodec.h
libavcodec/celp_math.h
libavcodec/h264.c
libavfilter/src_movie.c
libavformat/anm.c
libavformat/avformat.h
libavformat/version.h
libavutil/avstring.h
libavutil/bswap.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.h')
-rw-r--r-- | libavcodec/h264.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index ae71d68..196aba9 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -784,14 +784,14 @@ static av_always_inline uint16_t pack8to16(int a, int b){ } /** - * gets the chroma qp. + * Get the chroma qp. */ static av_always_inline int get_chroma_qp(H264Context *h, int t, int qscale){ return h->pps.chroma_qp_table[t][qscale]; } /** - * gets the predicted intra4x4 prediction mode. + * Get the predicted intra4x4 prediction mode. */ static av_always_inline int pred_intra_mode(H264Context *h, int n){ const int index8= scan8[n]; |